Test v2 signature changes. DONTBUILD
Backout 378083ea0d19. DONTBUILD