Revert 77330d7..c0e0e13

This rolls back to commit 77330d7c039220f1f2903cdb4532938a122fa8be.