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

This reverts commit 371dfd6187ff1a2c2fa3f0ad293f12a66b714b4e.

@dianakhuang