Revert ef5e8d9..01ae49a

This rolls back to commit ef5e8d90bca9b01b32fb503673032a88b4971280.