Revert "Merge branch 'user-lists-controller' into 'master'"

Closes #216960

See merge request gitlab-org/gitlab!31355