Changes required to pass UpdaterTaskTest.FindAndRemoveTest