From ab3f1ee0b8a4912a20249b6fbeedcf909dd1ca02 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sat, 20 Feb 2016 14:14:16 -0800
Subject: [PATCH] build_image: remove hack to work around an old bug

---
 build_image | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build_image b/build_image
index 52bf3a8f0c..bd87b69ca5 100755
--- a/build_image
+++ b/build_image
@@ -111,11 +111,6 @@ if [[ ${skip_test_build_root} -ne 1 ]]; then
   test_image_content "${BOARD_ROOT}"
 fi
 
-# Hack to fix bug where x86_64 CHOST line gets incorrectly added.
-# ToDo(msb): remove this hack.
-PACKAGES_FILE="${BOARD_ROOT}/packages/Packages"
-sudo sed -e "s/CHOST: x86_64-pc-linux-gnu//" -i "${PACKAGES_FILE}"
-
 # Handle existing directory.
 if [[ -e "${BUILD_DIR}" ]]; then
   if [[ ${FLAGS_replace} -eq ${FLAGS_TRUE} ]]; then