fix broken disabled devices when remove-disabled is set