http://code.google.com/p/googleappengine/issues/detail?id=4878 was recently escalated. We can take advantage of the fix once it's available.