diff --git a/CHANGELOG.md b/CHANGELOG.md
index c94fc000a..b66647082 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,8 +13,6 @@
 
 * Add a new night theme
 
-* Enable TLS v1.2 on all Android versions that support it
-
 * Fix crash when trying to install incompatible apps with the privileged
   installer
 
diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle
index 6a7069654..dfa961522 100644
--- a/F-Droid/build.gradle
+++ b/F-Droid/build.gradle
@@ -18,7 +18,6 @@ dependencies {
     compile 'com.google.zxing:core:3.2.1'
     compile 'eu.chainfire:libsuperuser:1.0.0.201510071325'
     compile 'cc.mvdan.accesspoint:library:0.1.3'
-    compile 'info.guardianproject.netcipher:netcipher:1.2'
     compile 'commons-net:commons-net:3.3'
     compile 'org.openhab.jmdns:jmdns:3.4.2'
 
@@ -67,7 +66,6 @@ if (!hasProperty('sourceDeps')) {
             'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
             'eu.chainfire:libsuperuser:a3ed4589e14f7d5ab255b3f31f7b79aaa1173a579035788f8db7c74215453a12',
             'cc.mvdan.accesspoint:library:dc89a085d6bc40381078b8dd7776b12bde0dbaf8ffbcddb17ec4ebc3edecc7ba',
-            'info.guardianproject.netcipher:netcipher:a8eef6c3bf190e360c44c9364044b8050f0d387418acdae8d7ec78bd105a32a6',
             'com.madgag.spongycastle:pkix:0d9cca6991f68eb373cfad309d5268c9fc38db5efb5fe00dcccf5c973af1eca1',
             'com.madgag.spongycastle:prov:b8c3fec3a59aac1aa04ccf4dad7179351e54ef7672f53f508151b614c131398a',
             'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
diff --git a/F-Droid/proguard-rules.pro b/F-Droid/proguard-rules.pro
index 116e81d5b..2edfcaca9 100644
--- a/F-Droid/proguard-rules.pro
+++ b/F-Droid/proguard-rules.pro
@@ -10,10 +10,6 @@
 -dontnote android.support.**
 -dontnote **ILicensingService
 
-# StrongHttpsClient and its support classes are totally unused, so the
-# ch.boye.httpclientandroidlib.** classes are also unneeded
--dontwarn info.guardianproject.netcipher.client.**
-
 # These libraries are known to break if minification is enabled on them. They
 # use reflection to instantiate classes, for example. If the keep flags are
 # removed, proguard will strip classes which are required, which may result in
diff --git a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java
index bdf1be37f..7be60f056 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java
@@ -23,8 +23,6 @@ import java.net.URL;
 
 import javax.net.ssl.SSLHandshakeException;
 
-import info.guardianproject.netcipher.NetCipher;
-
 public class HttpDownloader extends Downloader {
     private static final String TAG = "HttpDownloader";
 
@@ -102,11 +100,10 @@ public class HttpDownloader extends Downloader {
         if (prefs.isProxyEnabled() && !isSwapUrl()) {
             SocketAddress sa = new InetSocketAddress(prefs.getProxyHost(), prefs.getProxyPort());
             Proxy proxy = new Proxy(Proxy.Type.HTTP, sa);
-            NetCipher.setProxy(proxy);
+            connection = (HttpURLConnection) sourceUrl.openConnection(proxy);
         } else {
-            NetCipher.setProxy(null);
+            connection = (HttpURLConnection) sourceUrl.openConnection();
         }
-        connection = NetCipher.getHttpURLConnection(sourceUrl);
     }
 
     protected void doDownload() throws IOException, InterruptedException {