Discovered that old action handlers were depending on the new action
handler to remove them from the map.  They should be removed regardless.

Bug: 370119