Revert 0ec7708..6c116a0

This rolls back to commit 0ec770827937b5f3ba96b0db2c95a4909dfc32e8.
Revert 6c116a0..8baa3c7

This rolls back to commit 6c116a0ab868de0e4e22b55be3a9c110660d0c92.
put users controller back