Revert "Merge pull request #4976 from edx/will/ecom-128"

This reverts commit a03baee25cc1758193460190e8b16990dcf20767, reversing
changes made to 12e2d442e9bc3b919d36a9bad7d82ac27f01dd5c.