Revert de6caf87 and 51128b67 (https://reviews.llvm.org/D84974) The tests seem to be timing out in all linux bots. Need further analysis. Revert "run in terminal" This reverts commit de6caf87.
