Re-applies the changes from 3e0cfd447e (#11602), reverting d93ec0a0ba (#11764) now that the conflict with the webclient listener was fixed in 119edf51eb (#11895).
3e0cfd447e
d93ec0a0ba
119edf51eb