Merge "Revert "Annotate used fields.""