Revert e743939..9663993

This rolls back to commit e74393952d5cce238635ac8d08b666f33d87a646.