Deprecated header removal must have gotten lost in merge.
Revert "Deprecated header removal must have gotten lost in merge."

This reverts commit cf11ecb52700357592cdb4bbb25db8f81eae5ad8.
Merge remote-tracking branch 'origin' into infra_H