Fixes response contention for CORS
Revert "Fixes response contention for CORS"

This reverts commit 75bd43ca1355807a84fcd0a98e2af3c3e5804843.
Fixes response contention for CORS.
Merge remote-tracking branch 'origin/master'