Do not trim serial numbers

This broke in a refactoring. The 'true' was interpreted as length of 1.

Fixes part of #1436