Revert "Merge pull request #316 from hillbrad/corsFixes"

This reverts commit eed6a67045cd33ae49cca29aeac4366b22728832, reversing
changes made to 58c432e0f3a34ce0455c01f66d4841294ae59f4d.