Revert some changes for made for testing.