Revert "Merge branch 'dhcroft-VPChanIDFix' into 'master'"
This reverts merge request !4781 (merged), as with Detector!651 (merged) merged, these changes are not needed.
This reverts merge request !4781 (merged), as with Detector!651 (merged) merged, these changes are not needed.