The merge at [dd9633a03d] did not work because of the bug just fixed.
This change moves the changes that should have been in that merge into
the main line of the tree.