Revert de57c00..8110e10

This rolls back to commit de57c0095e0b15f9b8ea47ae63181b6c12738682.