I don't *think* these changes should have broken anything, but it's hard to tell because prior to fake api, we fail real fast trying to connect to the server...