Revert cd275d7..7cbb119

This rolls back to commit cd275d71951189cd9478e24e38cc8175f7e2c677.