Note that the above description is incorrect as to what the merge was about.
It is the message that I intended to make. It appears that I accidentaly merged multiple fixes waiting to be reviewed on my private fork.

This reverts commit dce0d2af, reversing
changes made to 63f67f30.