Removed our change to Annotator. It is not really needed anymore.