Reset user to previous commit
cherry pick users
Revert "cherry pick users"

This reverts commit beef5d60df3d6f3841d7dd61386ad31c7c162a7c.
Re-merge user