Avoid incorrect disabling PVR addons

Alternate to #4757.