Fixes #1811: Companion 2.0.12 Gvar import error (for limits)

Closes #1811