This reverts commit 8f4805a2.

This change was mistakenly committed and should have been dropped
with the rest of the series.
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>