This reverts commit b3fbdcec.

Unfortunately these clash with our DML update from the HW guys
as it's starting to get used now.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>