Revert "Fix - ensure additional menu .shortcuts are upgraded correctly"

This reverts commit b38ac7ef9bd09972e663011c2fde09b032642dd6.