Revert 7cb08ca..ac1e6ae

This rolls back to commit 7cb08cabbdb2ee70ed0a6f66eae20d18a7d3df65.
Revert ac1e6ae..e881575

This rolls back to commit ac1e6ae45e1e46307a643aa24d4ad1af259f4d3d.