Revert fd31c03..b1e45de

This rolls back to commit fd31c031b7da0e830dfab8a331a69a3a16c4dc84.
Revert b1e45de..41160ce

This rolls back to commit b1e45deef6125026b5826ad75f8782e04002aee2.