This reverts commit 5d3a21df, reversing
changes made to 56d37f1c.

Unfortunately this is causing CI failures:
https://travis-ci.org/github/trini/u-boot/jobs/711313649Signed-off-by: NTom Rini <trini@konsulko.com>