trying to get switch to normal polling for all v2 stuff