Fix the last remaining breakage since 4.4 (a missing merge it seems), related to use of custom protocols for system id