Revert ca074e0..75e2302

This rolls back to commit ca074e00eb842361b8b1de5677abc7fe838d7637.
Revert af32fc0..7287415

This rolls back to commit af32fc09d8ee185ae22127ec3b8b1fc0cb773ea2.