Also, we should [file a bug](https://code.google.com/p/googleappengine/issues/entry) with Google asking if they could raise a deadline error in this case, like we expect from other calls.  That would be a lot easier to deal with.