we can switch back after this PR is integrated in the IB and the results from the static analyzer confirm it's safe to go back