diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index b677d08977..de4ff6f590 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -2171,22 +2171,22 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
 			InstallOptionalHaikuImagePackage
 				$(baseURL)/xz-utils-5.0.4-x86-gcc4-2013-02-16.zip ;
 		} else {
-			# TODO: Remove! It's actually the repackaged gcc 4 archive.
-			InstallOptionalHaikuImagePackage
-				$(hpkgBaseURL)/xz-utils-5.0.1-2-x86_gcc2.hpkg ;
+			Echo "No optional package XZ-Utils available for gcc"
+				$(HAIKU_GCC_VERSION[1]) ;
 		}
 
-		AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
-			: "tar -Jtvf \\0045s"
-			: "tar -Jxvf \\0045s"
-		;
-		AddExpanderRuleToHaikuImage "application/x-xz" : .txz
-			: "tar -Jtvf \\0045s"
-			: "tar -Jxvf \\0045s"
-		;
-		AddExpanderRuleToHaikuImage "application/x-xz" : .xz
-			: "echo \\0045s | sed 's/.xz\\\$//g'"
-			: "xz -df \\0045s"
+# TODO: Move rules into package!
+#		AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
+#			: "tar -Jtvf \\0045s"
+#			: "tar -Jxvf \\0045s"
+#		;
+#		AddExpanderRuleToHaikuImage "application/x-xz" : .txz
+#			: "tar -Jtvf \\0045s"
+#			: "tar -Jxvf \\0045s"
+#		;
+#		AddExpanderRuleToHaikuImage "application/x-xz" : .xz
+#			: "echo \\0045s | sed 's/.xz\\\$//g'"
+#			: "xz -df \\0045s"
 		;
 	} else {
 		Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ;