diff --git a/src/create-extracts/create-extracts.sh b/src/create-extracts/create-extracts.sh
index 40f72f4..dea518c 100755
--- a/src/create-extracts/create-extracts.sh
+++ b/src/create-extracts/create-extracts.sh
@@ -21,11 +21,11 @@ function main() {
         echo 'Skip upload since no S3_ACCESS_KEY was found.'
     fi
 
-    # Generate patch sources first
+    # Generate patch sources first but do not upload them
     python create_extracts.py zoom-level "$WORLD_MBTILES" \
-        --max-zoom=5 --target-dir="$EXTRACT_DIR" $upload_flag
+        --max-zoom=5 --target-dir="$EXTRACT_DIR"
     python create_extracts.py zoom-level "$WORLD_MBTILES" \
-        --max-zoom=8 --target-dir="$EXTRACT_DIR" $upload_flag
+        --max-zoom=8 --target-dir="$EXTRACT_DIR"
 
     python create_extracts.py bbox "$WORLD_MBTILES" "$CITIES_TSV" \
         --patch-from="$PATCH_SRC" --target-dir="$EXTRACT_DIR" $upload_flag
diff --git a/src/create-extracts/create_extracts.py b/src/create-extracts/create_extracts.py
index 3101c7f..fdb636c 100755
--- a/src/create-extracts/create_extracts.py
+++ b/src/create-extracts/create_extracts.py
@@ -19,7 +19,7 @@ Options:
 
 import json
 import subprocess
-import mbutil
+import sqlite3
 import csv
 import os.path
 from collections import namedtuple
@@ -94,7 +94,7 @@ def update_metadata(mbtiles_file, metadata):
     Update metadata key value pairs inside the MBTiles file
     with the provided metadata
     """
-    conn = mbutil.mbtiles_connect(mbtiles_file)
+    conn = sqlite3.connect(mbtiles_file)
 
     def upsert_entry(key, value):
         conn.execute("DELETE FROM metadata WHERE name='{}'".format(key))
@@ -105,7 +105,7 @@ def update_metadata(mbtiles_file, metadata):
 
 
 def patch_mbtiles(source_file, target_file):
-    conn = mbutil.mbtiles_connect(target_file)
+    conn = sqlite3.connect(mbtiles_file)
     conn.executescript(
         """
         PRAGMA journal_mode=PERSIST;
diff --git a/src/create-extracts/requirements.txt b/src/create-extracts/requirements.txt
index a42717a..1d9dff8 100644
--- a/src/create-extracts/requirements.txt
+++ b/src/create-extracts/requirements.txt
@@ -1,2 +1 @@
--e git://github.com/mapbox/mbutil.git@master#egg=mbutil
 docopt==0.6.2