diff --git a/.jvmopts b/.jvmopts
index 840e2fab3e82..a50abf36aa42 100644
--- a/.jvmopts
+++ b/.jvmopts
@@ -3,4 +3,3 @@
 -Xmx4096m
 -XX:MaxInlineLevel=35
 -XX:ReservedCodeCacheSize=512m
--XX:MaxMetaspaceSize=1024m
\ No newline at end of file
diff --git a/community-build/community-projects/shapeless b/community-build/community-projects/shapeless
index b4c2d61ac785..bf335eb9900c 160000
--- a/community-build/community-projects/shapeless
+++ b/community-build/community-projects/shapeless
@@ -1 +1 @@
-Subproject commit b4c2d61ac785720c8ea33eda51104af15fb007d8
+Subproject commit bf335eb9900c0c8d4a8946867769c3fa1a1abfdf
diff --git a/project/scripts/sbt b/project/scripts/sbt
index 006d5952a6fc..6c0e1b7e9b31 100755
--- a/project/scripts/sbt
+++ b/project/scripts/sbt
@@ -9,7 +9,6 @@ CMD="${1:?Missing sbt command}"
 # run sbt with the supplied arg
 sbt -J-Xmx4096m \
     -J-XX:ReservedCodeCacheSize=512m \
-    -J-XX:MaxMetaspaceSize=1024m \
     -DSBT_PGP_USE_GPG=false \
     -no-colors \
     "$CMD"