Revert 0b7183a..7bc536a

This rolls back to commit 0b7183acc2f19e5382a5c2fd2b7aa666f0f9b284.