Repair the tree after an erroneous merge

The merge commit 0dbf74ef was meant to throw away the changes made by
the 8231b71 branch, but I accidentally swapped the sides of the merge.