Revert 4437dd6..a58e91c

This rolls back to commit 4437dd61135f32291d0af85cb0191f8a4ce0fc81.