This reverts commit 643dfd97. This patch still makes the AMDGPU buildbots unhappy. Reverting for now until the AMD folks figure it out.