This reverts the following commits:

"Mozilla 520500: test for (len > 0)"
46faa6b4

Revert "Mozilla 520500, Mozilla 521863"
ac2015db

Due to a regression introduced by ac2015db, which fails to pass
"make check", and chops the first character off all comment values.