Revert "Merge branch 'refs/heads/nouveauMoti' into moti-class"

This reverts commit 53a83b06e1551d87840ea0a41bb5a7b43a8a5eb4, reversing
changes made to b0c8e9a517f76d0cbee9e0d40d5d2bfc14f72e2a.