revert iffy steps so that client will work