diff --git a/jikesrvm/build/configs/RBaseBaseMarkSweep.properties b/jikesrvm/build/configs/RBaseBaseMarkSweep.properties
index 177a1d80..64785a5a 100644
--- a/jikesrvm/build/configs/RBaseBaseMarkSweep.properties
+++ b/jikesrvm/build/configs/RBaseBaseMarkSweep.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.marksweep.MS
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=MS
 rust.build=true
 rust.false.comment.start=/*
diff --git a/jikesrvm/build/configs/RBaseBaseNoGC.properties b/jikesrvm/build/configs/RBaseBaseNoGC.properties
index d68e9047..fad5d912 100644
--- a/jikesrvm/build/configs/RBaseBaseNoGC.properties
+++ b/jikesrvm/build/configs/RBaseBaseNoGC.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.nogc.NoGC
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=NoGC
 rust.build=true
 rust.false.comment.start=/*
diff --git a/jikesrvm/build/configs/RBaseBaseNoGCRelease.properties b/jikesrvm/build/configs/RBaseBaseNoGCRelease.properties
index 0a0d663c..fbc476fa 100644
--- a/jikesrvm/build/configs/RBaseBaseNoGCRelease.properties
+++ b/jikesrvm/build/configs/RBaseBaseNoGCRelease.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.nogc.NoGC
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=NoGC
 rust.build=true
 rust.false.comment.start=/*
diff --git a/jikesrvm/build/configs/RBaseBaseSemiSpaceRelease.properties b/jikesrvm/build/configs/RBaseBaseSemiSpaceRelease.properties
index 8a928acf..d1399d03 100644
--- a/jikesrvm/build/configs/RBaseBaseSemiSpaceRelease.properties
+++ b/jikesrvm/build/configs/RBaseBaseSemiSpaceRelease.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.semispace.SS
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=SS
 rust.build=true
 rust.false.comment.start=/*
diff --git a/jikesrvm/build/configs/RBaseBaseSemiSpaceSanity.properties b/jikesrvm/build/configs/RBaseBaseSemiSpaceSanity.properties
index 8c62d03f..b76095f3 100644
--- a/jikesrvm/build/configs/RBaseBaseSemiSpaceSanity.properties
+++ b/jikesrvm/build/configs/RBaseBaseSemiSpaceSanity.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.semispace.SS
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=SS
 rust.build=true
 rust.false.comment.start=/*
diff --git a/jikesrvm/build/configs/RFastAdaptiveMarkSweep.properties b/jikesrvm/build/configs/RFastAdaptiveMarkSweep.properties
index bf85782e..4f6a74f1 100644
--- a/jikesrvm/build/configs/RFastAdaptiveMarkSweep.properties
+++ b/jikesrvm/build/configs/RFastAdaptiveMarkSweep.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.marksweep.MS
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=MS
 config.include.aos=true
 config.assertions=none
diff --git a/jikesrvm/build/configs/RFastAdaptiveNoGC.properties b/jikesrvm/build/configs/RFastAdaptiveNoGC.properties
index c6c00035..7c2218b3 100644
--- a/jikesrvm/build/configs/RFastAdaptiveNoGC.properties
+++ b/jikesrvm/build/configs/RFastAdaptiveNoGC.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.nogc.NoGC
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=NoGC
 config.include.aos=true
 config.assertions=none
diff --git a/jikesrvm/build/configs/RFastAdaptiveNoGCDebug.properties b/jikesrvm/build/configs/RFastAdaptiveNoGCDebug.properties
index 7ffbf9c1..7a06da23 100644
--- a/jikesrvm/build/configs/RFastAdaptiveNoGCDebug.properties
+++ b/jikesrvm/build/configs/RFastAdaptiveNoGCDebug.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.nogc.NoGC
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=NoGC
 config.include.aos=true
 config.assertions=none
diff --git a/jikesrvm/build/configs/RFastAdaptiveSemiSpace.properties b/jikesrvm/build/configs/RFastAdaptiveSemiSpace.properties
index 385d28e3..dabd1c82 100644
--- a/jikesrvm/build/configs/RFastAdaptiveSemiSpace.properties
+++ b/jikesrvm/build/configs/RFastAdaptiveSemiSpace.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.semispace.SS
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=SS
 config.include.aos=true
 config.assertions=none
diff --git a/jikesrvm/build/configs/RFastAdaptiveSemiSpaceDebug.properties b/jikesrvm/build/configs/RFastAdaptiveSemiSpaceDebug.properties
index bb590b5e..8373c64e 100644
--- a/jikesrvm/build/configs/RFastAdaptiveSemiSpaceDebug.properties
+++ b/jikesrvm/build/configs/RFastAdaptiveSemiSpaceDebug.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.semispace.SS
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=SS
 config.include.aos=true
 config.assertions=none
diff --git a/jikesrvm/build/configs/RFastAdaptiveSemiSpaceDebugSanity.properties b/jikesrvm/build/configs/RFastAdaptiveSemiSpaceDebugSanity.properties
index c93b9a78..992d1f31 100644
--- a/jikesrvm/build/configs/RFastAdaptiveSemiSpaceDebugSanity.properties
+++ b/jikesrvm/build/configs/RFastAdaptiveSemiSpaceDebugSanity.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.semispace.SS
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=SS
 config.include.aos=true
 config.assertions=none
diff --git a/jikesrvm/build/configs/RFastAdaptiveSemiSpaceSanity.properties b/jikesrvm/build/configs/RFastAdaptiveSemiSpaceSanity.properties
index e326a11d..f279bc49 100644
--- a/jikesrvm/build/configs/RFastAdaptiveSemiSpaceSanity.properties
+++ b/jikesrvm/build/configs/RFastAdaptiveSemiSpaceSanity.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.semispace.SS
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=SS
 config.include.aos=true
 config.assertions=none
diff --git a/jikesrvm/build/configs/RFullAdaptiveNoGC.properties b/jikesrvm/build/configs/RFullAdaptiveNoGC.properties
index d5b93b13..8480cbf7 100644
--- a/jikesrvm/build/configs/RFullAdaptiveNoGC.properties
+++ b/jikesrvm/build/configs/RFullAdaptiveNoGC.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.nogc.NoGC
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=NoGC
 config.include.aos=true
 config.default-heapsize.initial=50
diff --git a/jikesrvm/build/configs/RFullAdaptiveNoGCDebug.properties b/jikesrvm/build/configs/RFullAdaptiveNoGCDebug.properties
index 9adca529..aaebd1a5 100644
--- a/jikesrvm/build/configs/RFullAdaptiveNoGCDebug.properties
+++ b/jikesrvm/build/configs/RFullAdaptiveNoGCDebug.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.nogc.NoGC
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=NoGC
 config.include.aos=true
 config.default-heapsize.initial=50
diff --git a/jikesrvm/build/configs/RFullAdaptiveSemiSpace.properties b/jikesrvm/build/configs/RFullAdaptiveSemiSpace.properties
index 0e07062f..426f0c44 100644
--- a/jikesrvm/build/configs/RFullAdaptiveSemiSpace.properties
+++ b/jikesrvm/build/configs/RFullAdaptiveSemiSpace.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.semispace.SS
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=SS
 config.include.aos=true
 config.default-heapsize.initial=50
diff --git a/jikesrvm/build/configs/RFullAdaptiveSemiSpaceDebug.properties b/jikesrvm/build/configs/RFullAdaptiveSemiSpaceDebug.properties
index 7d32b9b8..d9016672 100644
--- a/jikesrvm/build/configs/RFullAdaptiveSemiSpaceDebug.properties
+++ b/jikesrvm/build/configs/RFullAdaptiveSemiSpaceDebug.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.semispace.SS
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=SS
 config.include.aos=true
 config.default-heapsize.initial=50
diff --git a/jikesrvm/build/configs/RFullAdaptiveSemiSpaceSanity.properties b/jikesrvm/build/configs/RFullAdaptiveSemiSpaceSanity.properties
index 0a9d68c4..b6c279d3 100644
--- a/jikesrvm/build/configs/RFullAdaptiveSemiSpaceSanity.properties
+++ b/jikesrvm/build/configs/RFullAdaptiveSemiSpaceSanity.properties
@@ -10,7 +10,7 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-config.mmtk.plan=org.mmtk.plan.semispace.SS
+config.mmtk.plan=org.mmtk.plan.ThirdParty
 plan.name=SS
 config.include.aos=true
 config.default-heapsize.initial=50
diff --git a/repos/jikesrvm b/repos/jikesrvm
index aadd13f7..00f82df9 160000
--- a/repos/jikesrvm
+++ b/repos/jikesrvm
@@ -1 +1 @@
-Subproject commit aadd13f760034bfb921aec9da4ea871c7a4d77e1
+Subproject commit 00f82df9b86bf822d3c6771f65b297f85f8aac2e