#386190 by Jody Lynn, stop using the filter system for annotations and allow them to persist through node editing including revision support