Move to a simpler poll setup.