Revert e252c42..6c885d8

This rolls back to commit e252c4235c83363baeda2c2fcc93fe648b68a77c.