Revert 92a2a2a..95d9ab6

This rolls back to commit 92a2a2aef124b09dc12d3c9da76852c1435c0fed.
Revert 0387fa7..aa76bbb

This rolls back to commit 0387fa78e973719a0af07016bcd9f1a5849286ac.