Reverted 60cde9699 because of some obscure bug in appcfg.py