diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 19ea424af..f8b51982a 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -953,10 +953,6 @@ void CLI2::desugarFilterAttributes ()
         if (! canonicalize (canonical, "attribute", name))
           canonicalize (canonical, "uda", name);
 
-        // <name>:<value> is an assumed <name> is <value>
-        if (mod == "")
-          mod = "is";
-
         // TODO The "!" modifier is being dropped.
 
         A2 lhs (name, Lexer::Type::dom);
@@ -970,7 +966,13 @@ void CLI2::desugarFilterAttributes ()
         A2 rhs ("", Lexer::Type::string);
         rhs.tag ("FILTER");
 
-        if (mod == "before" || mod == "under" || mod == "below")
+        // Special case for '<name>:<value>'.
+        if (mod == "")
+        {
+          op.attribute ("raw", "=");
+          rhs.attribute ("raw", value);
+        }
+        else if (mod == "before" || mod == "under" || mod == "below")
         {
           op.attribute ("raw", "<");
           rhs.attribute ("raw", value);
@@ -1051,12 +1053,6 @@ void CLI2::desugarFilterAttributes ()
         found = true;
       }
 
-/*
-        std::string operatorLiteral = "=";
-        if (canonical == "status")
-          operatorLiteral = "==";
-*/
-
       if (found)
         changes = true;
       else