Revert 3a0b3f3..c2c658e

This rolls back to commit 3a0b3f31d72be3781d862bd44e421f65cc5b1511.