Revert "My User2 Changes"

This reverts commit 92b006a45a90d5f9a5a48d0467fe08a7d7635618.