Revert "Separate out user and oper commands"

This reverts commit f99a0a0256121d84223332d7de81850445531e84.