Revert e219f45..60b371b

This rolls back to commit e219f458f5ea64952d8e40748447a69d6b3919e8.