Revert "Better handling of OPTIONS pre-flight requests?"

This reverts commit 2b4f9dee40debe1f15d68b0f17d0941244d12251.