This reverts commit 55fa622f.

The regression caused by the original patch has been
cleared, thus introduce back the change.
Signed-off-by: NQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>