Don't use the "enable-old" override any more

The new ido-cr+ behavior should hopefully be sufficient to handle
everything without it.

This is a temporary measure. The override system needs to be reworked
completely.

ido-ubiquitous.el

@@ -657,6 +657,10 @@ completion for them."
                     (or ido-ubiquitous-active-override
                         ido-ubiquitous-default-state
                         'enable))
+                   (ido-ubiquitous-active-state
+                    (if (eq ido-ubiquitous-active-state 'enable-old)
+                        'enable
+                      ido-ubiquitous-active-state))
                    (ido-cr+-force-on-functional-collection
                     (or ido-ubiquitous-allow-on-functional-collection
                         (memq ido-ubiquitous-active-override