This reverts commit d8a2fe29d3.
That commit, by me, fixed the out of tree build errors by causing some
of the tests not to build at all.
This reverts commit d8a2fe29d3.
That commit, by me, fixed the out of tree build errors by causing some
of the tests not to build at all.