Adapt to changes in master.

See scala-ide/scala-ide#812
I don't think there is any need to keep the `Option` in the return type for this method and the previous one. Removing it would simplify a bit of code.