Revert "fix for haf system tests run in parallel"