Merge "Revert "Work around uwsgi breakage""