Revert commits 1bca2d1 and 31b5b70.