Revert 1232e85..3f891fb

This rolls back to commit 1232e855401f7a15bebf011724696dc75147ee1e.
Revert 2d2e755..a39db51

This rolls back to commit 2d2e755130a6589c5b088121106956ad8862dd6c.