Remove confusing use_polonius flag and do less cloning
#126023
+57
−51
Merged