Allow device to be removed when discriminant disabled