Let do 83d3875 for the IRC2PSO codepath