Revert to 4ba2034. YCM was bad idea afterall