Revert e609b6b..60c7c74

This rolls back to commit e609b6b7eb66ffdd05f8bcdb79c84eb4c669dea7.
Fix messed up merge