This reverts commit 7636930ceb. There is some randomization in the YAML test suite which means we can't check for exact xcontentlocation in the deprecation warning headers.
7636930ceb