[PATCH 0/2] Revert previous workaround for network-manager module