Revert two unintended changes in the last commit

This reverts commit 54cbc9e4130382537eea95f78c24f084031adb07.