reverting changes to server timeouts for now