Revert "Fixed Annotation ID"

This reverts commit 3fe017020124bc2e2722586e2cef23eff3c25a7a.