Don't generate the v2 key, use the one in source control.

Fixes #944
Fallout from #936

[skip ci]