Fix bug 963286: remove uservars from v2