diff --git a/src/backends/x11/cm/meta-backend-x11-cm.c b/src/backends/x11/cm/meta-backend-x11-cm.c
index fb1cdf86c..e5ebd68f2 100644
--- a/src/backends/x11/cm/meta-backend-x11-cm.c
+++ b/src/backends/x11/cm/meta-backend-x11-cm.c
@@ -360,10 +360,9 @@ meta_backend_x11_cm_handle_host_xevent (MetaBackendX11 *backend_x11,
             case XkbStateNotify:
               if (xkb_ev->state.changed & XkbGroupLockMask)
                 {
-                  // TODO: Restore this, ditch libgnomekbd
-                  // if (x11_cm->locked_group != xkb_ev->state.locked_group)
-                  //   XkbLockGroup (xdisplay, XkbUseCoreKbd,
-                  //                 x11_cm->locked_group);
+                  if (x11_cm->locked_group != xkb_ev->state.locked_group)
+                    XkbLockGroup (xdisplay, XkbUseCoreKbd,
+                                  x11_cm->locked_group);
                 }
               break;
             default: