Test v2 signature changes. DONTBUILD
Backout 8d1f713a2a84. DONTBUILD