Revert 7de0a93..1f9379d

This rolls back to commit 7de0a93fd095744ef6c4b04519b70b032731ee9c.
Revert aa76343..e7a58b6

This rolls back to commit aa7634318cadc8579efa06431f0ad098849f1bd8.