This fixes #7853.  I changed the names of the actions to be more clear.