diff --git a/mls/build.gradle b/mls/build.gradle
index 28b33b305d..573aa1c0e1 100644
--- a/mls/build.gradle
+++ b/mls/build.gradle
@@ -3,14 +3,30 @@ plugins {
 // OSGI
     id "biz.aQute.bnd.builder" version "7.0.0"
 //     Provide convenience executables for trying out the examples.
-//    id 'application'
+    id 'application'
     id 'com.google.protobuf' version '0.9.4'
 //     Generate IntelliJ IDEA's .idea & .iml project files
 //    id 'idea'
 }
 
-//apply plugin: 'java'
-//apply plugin: 'com.google.protobuf'
+apply plugin: 'java'
+apply plugin: 'com.google.protobuf'
+
+sourceSets {
+
+    main {
+        java {
+            srcDirs 'build/generated/source/proto/main/grpc'
+            srcDirs 'build/generated/source/proto/main/java'
+        }
+    }
+
+    java9 {
+        java {
+            srcDirs = ['src/main/jdk1.9']
+        }
+    }
+}
 
 dependencies {
     implementation project(':core')
@@ -102,19 +118,6 @@ protobuf {
 
 jar.archiveBaseName = "bcmls-$vmrange"
 
-sourceSets {
-    main {
-        java {
-            srcDirs 'build/generated/source/proto/main/grpc'
-            srcDirs 'build/generated/source/proto/main/java'
-        }
-    }
-    java9 {
-        java {
-            srcDirs = ['src/main/jdk1.9']
-        }
-    }
-}
 
 startScripts.enabled = false
 
diff --git a/mls/src/main/jdk1.9/module-info.java b/mls/src/main/jdk1.9/module-info.java
index df6a17016f..836725fd4c 100644
--- a/mls/src/main/jdk1.9/module-info.java
+++ b/mls/src/main/jdk1.9/module-info.java
@@ -1,7 +1,5 @@
 module org.bouncycastle.mls
 {
-    provides java.security.Provider with org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
-    
     requires java.logging;
     requires org.bouncycastle.provider;
     requires org.bouncycastle.util;
diff --git a/settings.gradle b/settings.gradle
index 530566e28b..c54949b153 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,6 +5,6 @@ include "pkix"
 include "prov"
 include "tls"
 include "test"
-//include "mls"
+include "mls"
 include "mail"
 include "jmail"