Revert "add these configs back"

This reverts commit 60b8adc3c860a858bcd387d0ab2a5bb8d1483e95.
Need to check if this fixes hotplugging.