could some please fix 17161?

[Eric . D . Friedman]

The other day I re-opened bug 17161 and included two possible "correct"
fixes.  Could someone with commit access please pick one and apply it?

Thanks,
Eric