Reverted reorganization of MongoDB and GAE.