See HHH-9417 for a more proper fix to this issue. Was decided that 4.2/4.3 would have a less disruptive, although less correct, solution for this problem.