Revert c11cf93..120aaa8

This rolls back to commit c11cf93d128433eefc2f0b6114753c52bfc614a6.