Revert cc93a60..99659ff

This rolls back to commit cc93a60cfc8fa804d9e87f3e83b09354dba41167.