SF bug #217195.
Not sure if chomp() is correct, but chop() definitely has problems.
This change seems to have no ill effects.

Backport candidate if Fred agrees.