This reverts commit f17639ea as three AMDGPU tests haven't been updated. Will need to verify the changes are not regressions we should avoid.