trying to fix the lack of proper status code and weird redirect chain. Checked into master so we can test on the dev server