Comment 2 for bug 1444514

Bleh, so this doesn't apply cleanly anymore because of other changes in master and needs rebasing.

The original code applies cleanly to rel_2_8 and rel_2_7 though...

So, I'm going to push the fix with mmorgan's signoff there for the maintenance releases tomorrow, but will coordinate further with tsbere, etc. to get a rebased version for master shortly thereafter for 2.9-beta+