This reverts commit a403fd1491, reversing changes made to b31287e264. 500 errors on prod, need to rethink this fix.
a403fd1491
b31287e264