Revert "Reduced header size"

This reverts commit b25da55a3dff45cd834e6ba4fadaa38530b0c428.