Revert 03fb9ae..d1de323

This rolls back to commit 03fb9aef755ff795afd0e5f6375121384ea746b3.
Revert 242d900..8ef1963

This rolls back to commit 242d90050e671c4c474c339c3bbe582b5a407829.