Revert cd20f64..671d2eb

This rolls back to commit cd20f64bb0e2e13459dac9f50fb59c71de3e19a1.
Revert fc7cb2a..d477720

This rolls back to commit fc7cb2adfd09c595fd0efaec11dbff74099676e2.