This reverts commit 8624574866. Reason for revert: Fix regressions Change-Id: I7d883e1c3cbd27bb64b581ec800243ad7dfe24fd [ROCm/clr commit: 07c1b9a998]
8624574866
07c1b9a998