Revert "[REFACTOR] Cleaned up annotation-related code in "editor" package"

This reverts commit 45f73983116f6461ccecc6d20c41998d3fea165e

It looks like this patch caused huge performance problems.
As the release process starts today, this patch will be
simply reverted for now and taken care of in the near future.

Change-Id: If209b7ee01621fbe486c482491fc6c8ea323c434
Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/1253
Tested-by: Jenkins CI
Reviewed-by: Franz Zieris <zieris@inf.fu-berlin.de>