Revert cfc6614..18ce854

This rolls back to commit cfc6614549138fd18c8440ab35a618348223ac35.
Revert abc852b..4e75779

This rolls back to commit abc852bcaa710ae70f1e5323e4d9dd144f351e0c.