diff --git a/components/blitz/src/omero/cmd/RequestObjectFactoryRegistry.java b/components/blitz/src/omero/cmd/RequestObjectFactoryRegistry.java
index 0effaeddf7f..0ebb92583d1 100644
--- a/components/blitz/src/omero/cmd/RequestObjectFactoryRegistry.java
+++ b/components/blitz/src/omero/cmd/RequestObjectFactoryRegistry.java
@@ -176,9 +176,10 @@ public Ice.Object create(String name) {
                 new ObjectFactory(ChmodI.ice_staticId()) {
                     @Override
                     public Ice.Object create(String name) {
-                        if (graphRequestFactory.isGraphsWrap()) {
+                        // TODO: Chmod2 too slow to be automatically substituted for Chmod
+                        /* if (graphRequestFactory.isGraphsWrap()) {
                             return new ChmodFacadeI(graphRequestFactory);
-                        } else {
+                        } else */ {
                             return new ChmodI(ic,
                                     ctx.getBean("chmodStrategy", ChmodStrategy.class));
                         }