This is a backwards-compatible window for this upgrade. It will
later be replaced with using the default location (whatever's on
PATH)