Don't rely on appspot
Merge pull request #1860 from dstufft/dont-rely-on-appspot

Don't rely on appspot