Yes, I think it's a good change.  The code previously had some retry logic which is partially torn disabled now, would be good to remove it entirely.