Test v2 signature changes. DONTBUILD
Backout 53db13404c16. DONTBUILD