Partial revert
Last commit contained some changes that did not belong there, revert
them for now.
Patch by: Sverre Rabbelier
A list of bugs is available in the Google App Engine SDK project on Google Code.Please visit http://code.google.com/p/googleappengine for more details.