Revert some changes to fix tests.