diff --git a/libquassel/src/main/kotlin/de/kuschku/libquassel/util/TlsInfo.kt b/libquassel/src/main/kotlin/de/kuschku/libquassel/util/TlsInfo.kt
index 3b070eb3b0981d7d4a977e83a993eae660d73fe4..d2e781dd954936c8f49eedd81e117a57d47e7a42 100644
--- a/libquassel/src/main/kotlin/de/kuschku/libquassel/util/TlsInfo.kt
+++ b/libquassel/src/main/kotlin/de/kuschku/libquassel/util/TlsInfo.kt
@@ -19,6 +19,7 @@
 
 package de.kuschku.quasseldroid.util
 
+import java.security.cert.Certificate
 import java.security.cert.X509Certificate
 import javax.net.ssl.SSLSession
 
@@ -63,8 +64,7 @@ data class TlsInfo(
         session.protocol,
         cipherSuite,
         keyExchangeMechanism,
-        session.peerCertificateChain
-          .map(javax.security.cert.X509Certificate::toJavaCertificate)
+        session.peerCertificates.map(Certificate::toX509)
       )
     }
   }
diff --git a/libquassel/src/main/kotlin/de/kuschku/libquassel/util/X509Helper.kt b/libquassel/src/main/kotlin/de/kuschku/libquassel/util/X509Helper.kt
index 0c76f12178f8abaa85a07f2ea8c3cf83d86ca169..0c5b8817744fb0189d60aba5df8de9f785c2469d 100644
--- a/libquassel/src/main/kotlin/de/kuschku/libquassel/util/X509Helper.kt
+++ b/libquassel/src/main/kotlin/de/kuschku/libquassel/util/X509Helper.kt
@@ -20,15 +20,12 @@
 package de.kuschku.quasseldroid.util
 
 import java.io.ByteArrayInputStream
+import java.security.cert.Certificate
 import java.security.cert.CertificateFactory
-import java.security.cert.X509Certificate as javaCertificate
-import javax.security.cert.X509Certificate as javaxCertificate
+import java.security.cert.X509Certificate
 
 private val certificateFactory = CertificateFactory.getInstance("X.509")
 
-fun javaxCertificate.toJavaCertificate(): javaCertificate =
+fun Certificate.toX509(): X509Certificate =
   certificateFactory.generateCertificate(ByteArrayInputStream(this.encoded))
-    as javaCertificate
-
-fun javaCertificate.toJavaXCertificate(): javaxCertificate =
-  javaxCertificate.getInstance(this.encoded)
+    as X509Certificate