This reverts commit 1cfc9d1860. Reason for revert: better fix in ROCclr Change-Id: I9707e69adf42a662c08fe9b3ec7458655d838bdd
1cfc9d1860