Unfortunately, this can not be safely fixed in existing saves (new games started after either patch on console would be fine, but it will not work after the first patch with games started before then). A fix would have required story changes, which have a significant chance of unintended consequences, a risk deemed too great given the relatively limited number of saves affected.
