We need to do this or else newly plugged devices might not load. It does not seem to harm UCM config on my machine, so this reverts 3d372424 See #1478
