Revert "More robust users list"

This reverts commit c301dec8f3a031cd794accc20ffaea79568fdeca.