diff --git a/AMBuildScript b/AMBuildScript
index c843b033..fd5ea381 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -499,17 +499,16 @@ if SM.use_auto_versioning():
   )
 
 # Build SourcePawn externally.
-with builder.Context('sourcepawn') as context:
-  SourcePawn = builder.RunScript('sourcepawn/AMBuildScript', {})
-  SP = SourcePawn(
-    root = SM,
-    amtl = os.path.join(builder.sourcePath, 'public', 'amtl'),
-  )
-  SP.BuildCore()
-  SM.spcomp = SP.spcomp
-  SM.binaries += [
-    SP.libsourcepawn
-  ]
+SourcePawn = builder.RunScript('sourcepawn/AMBuildScript', {})
+SP = SourcePawn(
+  root = SM,
+  amtl = os.path.join(builder.sourcePath, 'public', 'amtl'),
+)
+SP.BuildCore()
+SM.spcomp = SP.spcomp
+SM.binaries += [
+  SP.libsourcepawn
+]
 
 BuildScripts = [
   'loader/AMBuilder',
diff --git a/sourcepawn b/sourcepawn
index 1b306287..2b969103 160000
--- a/sourcepawn
+++ b/sourcepawn
@@ -1 +1 @@
-Subproject commit 1b3062875df9121a3fd553673b1a6c6c412d9b08
+Subproject commit 2b969103ff4dff74da3a0155e0ed187ea2d8667f