Comment # 3 on bug 1223269 from Jan Engelhardt

commit fb54c89a0df3d63198678b17d64aef4dbb599109 is reprised on the 6.1.1 branch
as 1a3ec3f2f8b2b7588cb81e1aa01b15d5d1725f20.