Annotation removal fix.