Revert 7b9048b..1e30f84

This rolls back to commit 7b9048b2ccfb1dbf184f27fe73cea32cf6fde72a.