Undid some changes that broke server