[Backport 2.x] Fix new header allowing their single-child's overflowing

[Backport 2.x] Fix new header allowing their single-child's overflowing #3495