Remove old variable with the next major version bump.