This reverts commit bb38918fda, reversing changes made to 83ee88e70f. This change should go to staging instead.
bb38918fda
83ee88e70f