Fix regression from r48990