Revert e37efad..f97cb72

This rolls back to commit e37efad4a0308d11282f11f5e93e19434db8a000.