Revert "through the GAE code away"

This reverts commit 115af105e0ad93cc8f0c746b2985c615a4dc69d2.