Repair the tree after an erroneous merge

The merge commit fbb4a4c0 was meant to throw away the changes made by
the 8bdac03 branch, but I accidentally swapped the sides of the merge.

suse-commit: 9f4e54712c1c11a0a393cc911ff90c50f87a9e36