Revert "Changes for the annotation plugin"
This reverts commit db452379ce61370a2d884275e1224c558318716b.
Authored by: astorch 2015-08-23
Parent: [r1183]