This reverts commit 7220267211. Change-Id: I022c2a8375f9929e9723cec66e1e0b960263fc39 [ROCm/clr commit: 2e9bc8f793]
7220267211
2e9bc8f793