Get rid of heavy omni complete - seems to hang on some machines
Merge upstream