Revert to previous Poller shutdown code