This reverts commit 3e6a8fb3.

Cc: Andy Gross <agross@kernel.org>
Cc: David Brown <david.brown@linaro.org>
Cc: Amit Kucheria <amit.kucheria@linaro.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Suggested-by: NAmit Kucheria <amit.kucheria@linaro.org>
Reported-by: NAndy Gross <andygro@gmail.com>
Signed-off-by: NEduardo Valentin <edubezval@gmail.com>