Wolfgang requested this be reverted and Rob agreed after further
discussion.  This was a symptom of a larger problem we need to deal
with.

This reverts commit 60d7d5a6.

Signed-off-by: Tom Rini <trini@ti.com>