Pull in fix to bug that double-schedules polls to P3 and P6.