Revert b7ce6ec..eb371e8

This rolls back to commit b7ce6ec42f9cf816e78949e0696a63ae5fbf9f1a.
Revert eb371e8..789e0ff

This rolls back to commit eb371e89465ecca68418e058fc4c21a08c7b9b2d.