Revert the previous language service merge.

Revert the previous language service merge.

We're going to do all the work in newLanguageService and then merge it all in when complete.