move action hooks to the places where v2 cartridges expect