This fixes (hopefully) a merging conflict we have in 4.4.1