Revert "Fix double nesting of error"
Revert "Fix double nesting of error"

This reverts commit 1a130f8b9ad82b91b1afeab16799427b945e780f.

Rudi said:
> I cherry picked it from the wrong branch my bad.
> The first `(error..`  actually signified that it's a catch clause
> while the 2nd rethrows it

ocaml/merlin,rgrinberg/merlin,the-lambda-church/merlin,ocaml/merlin,the-lambda-church/merlin,dra27/merlin,dra27/merlin,rgrinberg/merlin,rgrinberg/merlin,dra27/merlin,the-lambda-church/merlin,rgrinberg/merlin,ocaml/merlin,ocaml/merlin,dra27/merlin