Revert 0497e56..1bb7e5f

This rolls back to commit 0497e5698e4067e9a31f846c8458005a3b68f3df.
Revert "Revert 0497e56..1bb7e5f"

This reverts commit bea1272366de6c64639bd3a92e32470271f9964a.