Revert a7a0964..170bc5d

This rolls back to commit a7a09641696199fbd498cbf3e0bc0849e3cba277.
speed up and voting fixes