Revert "Merging feature/parallel-suites from aearly"

This reverts commit bc982f75aeefa611ab3786cbbd1382bd421a7c8d, reversing
changes made to d43392dff7d27f59b885141133ac1eb9506a4e86.
build-7