diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity
index 407ae13..6a76c7a 100644
--- a/helpers/make-ubiquity
+++ b/helpers/make-ubiquity
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=2
 
 . ./config
 
@@ -164,6 +164,8 @@ _Description: Continue without a network mirror?
  you will end up with only a very minimal base system.
 EOF
 
+# Remove restricted/nonfree handling
+sed '/apt-setup\/restricted/,/^$/d' -i ./ubiquity/plugins/ubi-prepare.py 
 
 # Rebrand
 replace $UPSTREAM $CODENAME .