This reverts commit e69fa03d. This patch lead to build time outs on the AMDGPU OpenMP runtime buildbot.