Revert a64f49c..656e202

This rolls back to commit a64f49c3ce5a6fd4ef0ba32cd102cd308da8468f.
Revert 656e202..6797a8f

This rolls back to commit 656e202efc92554027ad1604b398ec4cd019c76d.