This reverts commit dfdb0733a6a71b11d15006dafc13841e84fab7cd. BUG=None BRANCH=None TEST=None Reviewed-on: https://review.coreboot.org/16868 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Tested-by: build bot (Jenkins) Change-Id: I91bf5e42f4ac241f544742ce161bae651f9f9947 Reviewed-on: https://chromium-review.googlesource.com/392870 Commit-Ready: Furquan Shaikh <furquan@chromium.org> Tested-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>