SF patch #1057588; other changes make the rest of the patch out of date
or otherwise unnecessary
(backported from trunk revision 1.188)