This reverts commit 4c3a3292.

Bhawan's fix is better (less ifdefs), so revert this and apply Bhawan's.
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>