Fixed a bug created by the GAE hack. GAE now no longer works.