This reverts commit e9965577.  Our HW
guys were able to fix this so it never sees the light of day.
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>