Water Crisis Almost Over; Restrictions Lifted Tonight