Revert "Merge branch 'modeling-users'"

This reverts commit 5d011a0325de8c38614c1961b918041101628ac7, reversing
changes made to b720713bb13eee14601049cbb240b8e8f9b35c12.