K 10 svn:author V 5 dougb K 8 svn:date V 27 2012-03-04T18:17:01.000000Z K 7 svn:log V 132 Restore the fix from 1.161 since it seems to still be necessary, at least in some environments. Still under investigation upstream. END