Backported from Thomas's patch, we also need this for 2.4.