Revert 00c6900..437edee

This rolls back to commit 00c6900f0a846fa6d0f05d9bef375ddd450fbdc2.