[HELIX-433] Fix how FULL_AUTO responds to untagging