Revert 1ef8e76..cc3852e

This rolls back to commit 1ef8e7623ab547dbe8bd85c3c6ac6944ece6c448.