diff --git a/CHANGELOG.md b/CHANGELOG.md
index c55a456d1..ef882b502 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change Log
 ---
 =======
+### 9.7.2 (2020-06-22)
+
+* Downgrade Mapbox SDK to remove non-free library (F-Droid only)
+
 ### 9.7.1 (2020-06-19)
 
 * Fix crash on backup import
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 274d71c67..1bc9f4077 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -44,8 +44,8 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 90702
-        versionName = "9.7.1"
+        versionCode = 90703
+        versionName = "9.7.2"
         targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)
         testInstrumentationRunner = "org.tasks.TestRunner"
@@ -135,6 +135,7 @@ configurations.all {
     exclude(group = "com.google.j2objc")
 }
 
+val genericImplementation by configurations
 val googleplayImplementation by configurations
 
 dependencies {
@@ -190,11 +191,14 @@ dependencies {
     implementation("com.google.apis:google-api-services-drive:v3-rev20200413-1.30.9")
     implementation("com.google.auth:google-auth-library-oauth2-http:0.20.0")
     implementation("androidx.work:work-runtime:${Versions.work}")
-    implementation("com.mapbox.mapboxsdk:mapbox-android-sdk:9.2.1")
     implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:5.2.1")
     implementation("com.etesync:journalmanager:1.1.0")
     implementation("com.github.QuadFlask:colorpicker:0.0.15")
 
+    // https://github.com/mapbox/mapbox-gl-native-android/issues/316
+    genericImplementation("com.mapbox.mapboxsdk:mapbox-android-sdk:7.4.1")
+
+    googleplayImplementation("com.mapbox.mapboxsdk:mapbox-android-sdk:9.2.1")
     googleplayImplementation("com.crashlytics.sdk.android:crashlytics:${Versions.crashlytics}")
     googleplayImplementation("com.google.firebase:firebase-analytics:${Versions.analytics}")
     googleplayImplementation("com.google.firebase:firebase-config-ktx:${Versions.remote_config}")
diff --git a/app/src/main/res/values/changelog.xml b/app/src/main/res/values/changelog.xml
index 8333a1d77..a7982bc3f 100644
--- a/app/src/main/res/values/changelog.xml
+++ b/app/src/main/res/values/changelog.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="changelog">
-        <item>Added \'☰ > Manage lists\'\n\t- Drag and drop to rearrange the drawer\n\t- Tap to edit or delete a list</item>
-        <item>Display 2 additional snooze options - @rangzen</item>
-        <item>Fix crash on backup import</item>
-        <item>Fix CalDAV/EteSync subtask move bug</item>
-        <item>Update translations</item>
+        <item>Downgrade Mapbox SDK to remove non-free library (F-Droid only)</item>
     </string-array>
 </resources>
diff --git a/fastlane/metadata/android/en-US/changelogs/90703.txt b/fastlane/metadata/android/en-US/changelogs/90703.txt
new file mode 100644
index 000000000..d0dbfe3ee
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90703.txt
@@ -0,0 +1 @@
+* Downgrade Mapbox SDK to remove non-free library (F-Droid only)
diff --git a/gradle.properties b/gradle.properties
index 7b43fff66..e7597f0ef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,8 +9,7 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
 #Mon Jun 15 15:28:40 CDT 2020
-android.enableJetifier=false
+android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"