Revert b879fc2..bc8564a

This rolls back to commit b879fc2115909b34020ba2831b608ec2c16750a3.