Revert "Trim headerRecord fields"

This reverts commit f3ba731431e2326baddfede2bc9b0c0d695e6cc5.