Revert c37e1c2..316ca93

This rolls back to commit c37e1c2a9756258b0b8cbfbea683992e57d0ade6.