diff --git a/lib/SimpleSAML/Locale/Translate.php b/lib/SimpleSAML/Locale/Translate.php
index 888c0773ef7837edb9a88ab2ad973aa3e3b86b97..004a7cd8165e793b5d77efaff1d49ef2ff11c729 100644
--- a/lib/SimpleSAML/Locale/Translate.php
+++ b/lib/SimpleSAML/Locale/Translate.php
@@ -228,7 +228,7 @@ class Translate
      *
      * @return string The tag, unchanged.
      */
-    public function noop($tag)
+    static public function noop($tag)
     {
         return $tag;
     }
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index af971624922c80b4cec382452405eb9a69d57c68..1ebd2fbfc5be696876187caf6547f2bd2623bf84 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -567,14 +567,14 @@ class SimpleSAML_XHTML_Template
 
 
     /**
-     * Wrap Language->noop to mark a tag for translation but actually do it later.
+     * Behave like Language->noop to mark a tag for translation but actually do it later.
      *
      * @see \SimpleSAML\Locale\Translate::noop()
-     * @deprecated This method will be removed in SSP 2.0. Please use \SimpleSAML\Locale\Translate::t() instead.
+     * @deprecated This method will be removed in SSP 2.0. Please use \SimpleSAML\Locale\Translate::noop() instead.
      */
-    public function noop($tag)
+    static public function noop($tag)
     {
-        return $this->translator->noop($tag);
+        return $tag;
     }