Reverting a bunch of change for wsgi