This reverts commit 0148df81. Getting a lit test failures on AMDGPU but I can't reproduce it so far. Reverting to investigate.