Revert "Optimized header"

This reverts commit 92a03cc44723a3d8651561bc84ad9eaf502831b1.