diff --git a/core/control/ContentNegotiator.php b/core/control/ContentNegotiator.php
index 2675ba3f9..d5865de62 100755
--- a/core/control/ContentNegotiator.php
+++ b/core/control/ContentNegotiator.php
@@ -57,6 +57,13 @@ class ContentNegotiator {
 	static function enable() {
 		self::$enabled = true;
 	}
+	
+	/*
+	 * Disable content negotiation for all templates, not just those with the xml header.
+	 */
+	static function disable() {
+		self::$enabled = false;
+	}
 
 	/**
 	 * Returns true if negotation is enabled for the given response.