Revert "REVERT Polish optimizations (did not work)"

This reverts commit 09681513a629447161c4ff3fd974af737ebe0c44.