Revert back from upgrade test