Revert the previous language service merge.

Revert the previous language service merge.

We're going to make all the breaking changes to the LS api in the newLanguageService branch, and then merge it all in when it is complete.