Revert bc38ffc..5d186e0

This rolls back to commit bc38ffc46115e78f9c46ce3b50ca331fbd244089.