Revert "latest User changes"

This reverts commit d19d58523d7393e90c96062dada6fc0c0c682871.