This reverts commit 51627f03.

Reason for revert: it causes regression on Aldebaran.
Signed-off-by: NEric Huang <jinhuieric.huang@amd.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>