Revert 91976b7..ba974f1

This rolls back to commit 91976b7bdd222d6a1692b42060fe6938fb54a305.
Revert ba974f1..b62af32

This rolls back to commit ba974f1c1bf3a48227e5bf63756377aabe1beb72.