Revert 0497e56..7fba3ce

This rolls back to commit 0497e5698e4067e9a31f846c8458005a3b68f3df.