Revert "fix cross origin for real this time"

This reverts commit 5105244dd3187f6ff684d895370e566e47577937, reversing
changes made to 5cc7d3c26d7cf947590d57cb120a8345e2fd68a7.
Revert "fix cross origin for real this time"

This reverts commit 5cc7d3c26d7cf947590d57cb120a8345e2fd68a7.
fix up merge