Changes required to pass UpdaterTaskTTest.RemoveTest2