Change comments to use no expiration duration instead of pollDuration x 2