diff --git a/.gitignore b/.gitignore
index 9dfb6a8c..e90d236f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,7 +66,6 @@ packages/*
 # FAKE & Paket
 packages
 paket-files
-.paket/paket.exe
 .fake
 
 # Generated Doc Files
diff --git a/.paket/paket.bootstrapper.exe b/.paket/paket.bootstrapper.exe
deleted file mode 100644
index 7d62a41c..00000000
Binary files a/.paket/paket.bootstrapper.exe and /dev/null differ
diff --git a/.paket/paket.exe b/.paket/paket.exe
new file mode 100644
index 00000000..d313024f
Binary files /dev/null and b/.paket/paket.exe differ
diff --git a/build.cmd b/build.cmd
index cd4d1669..e9933d32 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,11 +1,6 @@
 @echo off
 cls
 
-.paket\paket.bootstrapper.exe
-if errorlevel 1 (
-  exit /b %errorlevel%
-)
-
 .paket\paket.exe restore
 if errorlevel 1 (
   exit /b %errorlevel%
diff --git a/build.sh b/build.sh
index 746f950e..25bebb1e 100755
--- a/build.sh
+++ b/build.sh
@@ -5,7 +5,6 @@ set -o pipefail
 
 cd "$(dirname "$0")"
 
-PAKET_BOOTSTRAPPER_EXE=.paket/paket.bootstrapper.exe
 PAKET_EXE=.paket/paket.exe
 FAKE_EXE=packages/build/FAKE/tools/FAKE.exe
 
@@ -35,6 +34,5 @@ then
   mozroots --import --sync --quiet
 fi
 
-run $PAKET_BOOTSTRAPPER_EXE
 run $PAKET_EXE restore
 run $FAKE_EXE "$@" $FSIARGS $FSIARGS2 build.fsx
diff --git a/paket.sh b/paket.sh
index 801a36bb..d14c3d62 100755
--- a/paket.sh
+++ b/paket.sh
@@ -26,5 +26,4 @@ then
   mozroots --import --sync --quiet
 fi
 
-run .paket/paket.bootstrapper.exe
 run .paket/paket.exe "$@"
diff --git a/restore.cmd b/restore.cmd
index 27160893..00ac050e 100644
--- a/restore.cmd
+++ b/restore.cmd
@@ -1,11 +1,6 @@
 @echo off
 cls
 
-.paket\paket.bootstrapper.exe
-if errorlevel 1 (
-  exit /b %errorlevel%
-)
-
 .paket\paket.exe restore
 if errorlevel 1 (
   exit /b %errorlevel%
diff --git a/restore.sh b/restore.sh
index 88477ccd..f1cab8e3 100755
--- a/restore.sh
+++ b/restore.sh
@@ -3,13 +3,15 @@
 set -eu
 set -o pipefail
 
-cd `dirname $0`
+cd "$(dirname "$0")"
+
+PAKET_EXE=.paket/paket.exe
 
-FSIARGS=""
 OS=${OS:-"unknown"}
 if [[ "$OS" != "Windows_NT" ]]
 then
-  FSIARGS="--fsiargs -d:MONO"
+  # Allows NETFramework like net45 to be built using dotnet core tooling with mono
+  export FrameworkPathOverride=$(dirname $(which mono))/../lib/mono/4.5/
 fi
 
 function run() {
@@ -26,5 +28,4 @@ then
   mozroots --import --sync --quiet
 fi
 
-run .paket/paket.bootstrapper.exe
-run .paket/paket.exe restore
+run $PAKET_EXE restore