This reverts commit 3846fd9b86. There were some precursor commits missing for this around connector locking, we should probably merge Lyude's nouveau avoid the problem patch.
3846fd9b86