Revert 466616f..41e6151

This rolls back to commit 466616ffed0b3dfab0ccd8c769875b79c3e5489c.
Revert a08a36a..ef69080

This rolls back to commit a08a36a36ef670e122ea6182c9e09e8fc2dff111.