Revert 6f14dbb..e287aec

This rolls back to commit 6f14dbb051841d682412cbac2f08eb16ce86ee9a.
0.4.0

Working with user/teams