Simplified injection of header
Revert "Fix the broken"

This reverts commit 60216edca504df7fe78b0e10777eb9a5e727dc7d.
Merge branch 'inject-fix'