Undo users resource
Merge branch 'pre-users'