Add support for new voting system

Thanks to Thomas Foster, try the old class first, and if that doesn't
work, try the new one.