This reverts commit 3b470cb067. Reason for revert: Breaking change that will be merged in at a later date Change-Id: Idd300492cc08a57c50decc22df287ddcc5463c88 [ROCm/clr commit: 6e55f40313]
3b470cb067
6e55f40313