Revert "Try to resolve build cycle when running discovery tests" This reverts commit 8ceab8f705dc185ced2665b33ca7f2e959ee37ba.