diff --git a/build_packages b/build_packages
index 81a63d8..115d567 100755
--- a/build_packages
+++ b/build_packages
@@ -90,7 +90,7 @@
   "Build factory installer."
 DEFINE_boolean withtest "${FLAGS_TRUE}" \
   "Build packages required for testing."
-DEFINE_boolean expandedbinhosts "${FLAGS_FALSE}" \
+DEFINE_boolean expandedbinhosts "${FLAGS_TRUE}" \
   "Allow expanded binhost inheritance."
 
 # The --reuse_pkgs_from_local_boards flag tells Portage to share binary
@@ -204,9 +204,7 @@
   if [ "${FLAGS_cleanbuild}" -eq "${FLAGS_TRUE}" ]; then
     UPDATE_ARGS+=( --force )
   fi
-  if [[ "${FLAGS_expandedbinhosts}" -eq "${FLAGS_TRUE}" ]]; then
-    UPDATE_ARGS+=( --more-binhosts )
-  else
+  if [[ "${FLAGS_expandedbinhosts}" -eq "${FLAGS_FALSE}" ]]; then
     UPDATE_ARGS+=( --fewer-binhosts )
   fi