This seems to be the root cause of hangs on amdgpu. Reverting while investigating. This reverts commit 7b9844cc.