Revert 6d71998..118a577

This rolls back to commit 6d719988bf3a535fd65de54d6453d589fd4ecaeb.