Ooops, actually land the fix with this ChangeLog entry: