This reverts commit 075e8080.

Reason for revert: the related commit is reverted.
Signed-off-by: NEric Huang <jinhuieric.huang@amd.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>