Revert merging from the 1.4.5 branch.

I suppose there was a better way, but it is not obvious and learning it
would leave the master branch in a bad state.