Revert c9d6821..8214978

This rolls back to commit c9d6821b9ed92dc3046d23216a9e85958b318c16.