Note that we cannot add new unit tests for this fix without making it a much bigger change since the problematic function is static.
Note that we cannot add new unit tests for this fix without making it a much bigger change since the problematic function is static.