Revert a few more accidental changes that became obvious in the pull request view.