diff --git a/repository/src/main/java/org/alfresco/repo/jscript/People.java b/repository/src/main/java/org/alfresco/repo/jscript/People.java
index 40133343e0..5223e7f773 100644
--- a/repository/src/main/java/org/alfresco/repo/jscript/People.java
+++ b/repository/src/main/java/org/alfresco/repo/jscript/People.java
@@ -582,16 +582,8 @@ public class People extends BaseScopableProcessorExtension implements Initializi
     {
         ParameterCheck.mandatory("pagingRequest", pagingRequest);
         
-        boolean useCQ = false;
-        if (filter != null)
-        {
-            if (filter.endsWith(HINT_CQ_SUFFIX))
-            {
-                useCQ = honorHintUseCQ;
-                filter = filter.substring(0, filter.length()-HINT_CQ_SUFFIX.length());
-            }
-        }
-        else
+        boolean useCQ = honorHintUseCQ;
+        if (filter == null)
         {
             filter = "*";
         }