Comment 2 for bug 1267252

Tested and works for me. Thanks Jeff!

Backported cleanly from master to rel_2_5, but with rel_2_4 there were conflicts due to whitespace vs. tab issues. Hand resolved the conflicts to make the change for rel_2_4 and it's in there too.