Followup to bug 836198: Clean up a bit of rebase vomit.