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