Revert 4b53d76..312c3c1

This rolls back to commit 4b53d76187274f999b2778947731ce17cd3e6f55.