Code review comment for ~till-kamppeter/network-manager:master

OK Till, thanks, I'm going to upload this now because I've run it a bunch of times here and it hasn't failed. I have an uneasy feeling about removing code without understanding why it's going wrong, so I think it would be good if we could understand that - but having a passing NM is also valuable to us.