See my comment on #3868 (I accidentally commented on the 7.1 version)