Going back to Keystone v2

That was a mistake...