TP v.
Revert "TP v."

This reverts commit 79d6f6d24252cded21c3ef53c9e39580a9929ebe.
TP v1.7.2 Poll fix