Remove the workarounds for 500's and basic auth