Revert "Slightly better scalability"

This reverts commit 8fe687be9b3a1f50ab1605b7498c9f3de8604230.
Undefined in openmp if only some threads encounter a barrier.