Discovered when testing migration from v1 to v2: we should probably only have one of these vars to reduce confusion.