I had some inprogress changes in my local tree when when
git bz applying the patches on bug 618047.

Those unfinished changes got interleaved into the commits,
creating a bit of a mess.

Also, bug 618047 has been reopened.

This commit reverts those changes for now until.