Revert d0b8084..3c1fd85

This rolls back to commit d0b808423b319a34988b56157b98050c987aec69.