Revert e3ae265..98f6a2b

This rolls back to commit e3ae2658ccb563f41a687c353fb2a0bd184c1ee5.