This reverts commit 316ab801. Signed-off-by: Simon Glass <sjg@chromium.org>
mentioned in commit c5e81fdd