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