Revert "Trim headerRecord fields"

This reverts commit 37701dc0c6b8c90701f8a20547a03530564a7541.