Upgrade to annotations. Adds uniqid for identifying.
Revert "Upgrade to annotations. Adds uniqid for identifying."

This reverts commit c1f3c55701bfd4e28bf09b20d97cbb605e96f433.