Revert e341c27..9d2f4aa

This rolls back to commit e341c275b8888cb5bb958acba516cd7f4bc8dc6a.