Revert 7180f76..4ca05f9

This rolls back to commit 7180f76713fcb6a169547e7e3cd77dddbd25f0fd.
Revert 4ca05f9..abaa304

This rolls back to commit 4ca05f9d5e232bf82859e370a676e6e58b02c655.