Revert: "Add MultiUser support"