[TMP] Restored maybe_annotate