Revert e0d4b82..7f33c51

This rolls back to commit e0d4b827a2fc2dda5910a2a855bee27eece575f6.