Merge "Revert "Move annotations to native.""