Revert most changes for testing