Revert "Revert "update to Poly""

This reverts commit 412513525c6fc016915f8e40e05d7d1a4c222ac3.