Revert part of http://gerrit-git.amd.com/c/compute/ec/hipamd/+/675588 Change-Id: Iee9dac9f8c50aa9b6a12ca9d8fd792a51973b8cd