This reverts commit e36b1d4ad1, reversing changes made to c2ea7318be. Should go to staging.
e36b1d4ad1
c2ea7318be