This changeset also brings back deleted annotations so that they do not cause build issues in other components.