Remove deprecated code from user module

This reverts commit 7b270d57.

Closes #3573870

Merge request reports

Loading