Reintroduce bug fix 26008