This one still appears to be needed. See 1099745#c8. @David: any idea for a better fix, so that we can get rid of this downstream fix at last?