This reverts commit be5149a315. It caused build failures in the openmp-offload-amdgpu-runtime buildbot and others.
be5149a315
convergencectrl