REVERT Polish optimizations (did not work)

please test before readding