This reverts commit 4aa12afb. This change introduced failures upon checking out the PR source code. Pulling this out of tree while I investigate further.