diff --git a/set_env_vars b/set_env_vars
index a90115d3a4fdcd61cc8a7127320f4a90ed2dbf77..f7a42fbd4e3d0b117060021cc31b3b2379f27067 100644
--- a/set_env_vars
+++ b/set_env_vars
@@ -2,12 +2,10 @@ export ZAFL_TRACE_MAP_FIXED_ADDRESS=0x10000
 export AFL_SKIP_BIN_CHECK=1
 
 export ZAFL_HOME=$PWD
-if [ -z "$ZAFL_INSTALL" -o -f manifest.txt ]; then
-	if [ -z "$ZAFL_INSTALL" ]; then
-		export ZAFL_INSTALL=$PWD/install
-	fi
-	export PS_INSTALL=$ZAFL_INSTALL/zipr_umbrella
+if [ -z "$ZAFL_INSTALL" ]; then
+	export ZAFL_INSTALL=$PWD/install
 fi
+export PS_INSTALL=$ZAFL_INSTALL/zipr_umbrella
 
 cd $ZAFL_HOME/zipr_umbrella
 source ./set_env_vars
diff --git a/zipr_umbrella b/zipr_umbrella
index 0946430dd7027ecce49bf4ef5043703ca9c0e067..018f3580c62c7293810f937594c5cf078376dc1a 160000
--- a/zipr_umbrella
+++ b/zipr_umbrella
@@ -1 +1 @@
-Subproject commit 0946430dd7027ecce49bf4ef5043703ca9c0e067
+Subproject commit 018f3580c62c7293810f937594c5cf078376dc1a