Remove special handling for Vote NY

Change-Id: I264a8365be9a1067a8114934feedb9e719e92eb3
Merge "Remove special handling for Vote NY"