Switch to YCM (again)