back out appengine-related changes