Again, I messed up the usage, now we are safe from devices being removed.
This fixes a number of error reports from users.