add rollback protection for annotation "extras"