Going back to Keystone v2