Revert e3e4ad6..de3943d

This rolls back to commit e3e4ad606acb69c3f79f735412cc87b2e50500c3.