Deprecated header removal must have gotten lost in merge.