This reverts commit f86caab0. Signed-off-by: Simon Glass <sjg@chromium.org>
mentioned in commit 18cfbbba