Remove unrelated changes that were inadvertently introduced during the rebase

(The rebase isn't visible in the history since it changed the history.)