Revert eb5afea..fb01f9a

This rolls back to commit eb5afea7cdf48ea0cbb0c70e35b640053abf27f0.