Failed rework did not merge shipcontrol correctly.