[DF-4714] Fix after merge.