Don't trust WM_PROTOCOLS
Revert "Don't trust WM_PROTOCOLS"

This reverts commit 2bfaefa08f9db1eede1ee38c63f1f79568246a55.
Merge branch 'master' into develop