This reverts commit bb38918f, reversing changes made to 83ee88e7. This change should go to staging instead.