diff --git a/build_image b/build_image
index d85968594c..c93ed350b6 100755
--- a/build_image
+++ b/build_image
@@ -277,7 +277,7 @@ sudo cp -a "${BOARD_ROOT}"/lib/libgcc_s.so* "${ROOT_FS_DIR}/lib"
 sudo cp -a "${BOARD_ROOT}"/usr/lib/libstdc++.so* "${ROOT_FS_DIR}/usr/lib"
 
 INSTALL_MASK=""
-if [[ $FLAGS_installmask -eq $FLAGS_FALSE ]] ; then
+if [[ $FLAGS_installmask -eq ${FLAGS_TRUE} ]] ; then
   INSTALL_MASK="$DEFAULT_INSTALL_MASK"
 fi
 
@@ -319,6 +319,11 @@ if [[ $FLAGS_withdev -eq $FLAGS_TRUE ]] ; then
       --root="$ROOT_DEV_DIR" --root-deps=rdeps \
       --usepkgonly chromeos-dev $EMERGE_JOBS
 
+  # TODO(sosa@chromium.org) - Re-hide under statefuldev after switch
+  # Flag will mount /usr/local on target device
+  sudo mkdir -p "$ROOT_FS_DIR/root"
+  sudo touch "$ROOT_FS_DIR/root/.dev_mode"
+
   # The ldd tool is a useful shell script but lives in glibc; just copy it.
   sudo cp -a "$(which ldd)" "${ROOT_DEV_DIR}/usr/bin"
 fi
@@ -387,13 +392,8 @@ menuentry "serial debug" {
 
 EOF
 
-# Enable dev mode on the target system and re-run ldconfig
-# for rootfs's ld.so.cache
+# Run ldconfig for rootfs's ld.so.cache
 if [ $FLAGS_statefuldev -eq $FLAGS_TRUE ] ; then
-  # Flag will mount /usr/local on target device
-  sudo mkdir -p "$ROOT_FS_DIR/root"
-  sudo touch "$ROOT_FS_DIR/root/.dev_mode"
-
   # Re-run ldconfig to fix /etc/ldconfig.so.cache
   sudo /sbin/ldconfig -r "$ROOT_FS_DIR"
 
diff --git a/common.sh b/common.sh
index f0e139504e..253954c057 100644
--- a/common.sh
+++ b/common.sh
@@ -117,7 +117,7 @@ fi
 CHROOT_TRUNK_DIR="/home/$USER/trunk"
 
 # Install make for portage ebuilds.  Used by build_image and gmergefs.
-DEFAULT_INSTALL_MASK="/usr/include/ /usr/man /usr/share/man /usr/share/doc \
+DEFAULT_INSTALL_MASK="/usr/include /usr/man /usr/share/man /usr/share/doc \
   /usr/share/gtk-doc /usr/share/gtk-2.0 /usr/lib/gtk-2.0/include \
   /usr/share/info /usr/share/aclocal /usr/lib/gcc /usr/lib/pkgconfig \
   /usr/share/pkgconfig /usr/share/gettext /usr/share/readline /etc/runlevels \