This reverts commit 0dbc006760, reversing changes made to cb7f774265. Should go into staging.
0dbc006760
cb7f774265