Reverting commit for good measure.
Reverting commit for good measure.

Revert "Merge pull request #2584 from alanchenz/develop"

This reverts commit fb141ebe5f31b57941c77ce396fc306b2d947a9d, reversing
changes made to 7c9d95410832d07cda03ea77bec5d7e5c71a62fc.

DXCanas/kolibri,mrpau/kolibri,benjaoming/kolibri,christianmemije/kolibri,lyw07/kolibri,learningequality/kolibri,learningequality/kolibri,benjaoming/kolibri,jonboiser/kolibri,DXCanas/kolibri,learningequality/kolibri,jonboiser/kolibri,jonboiser/kolibri,indirectlylit/kolibri,mrpau/kolibri,indirectlylit/kolibri,mrpau/kolibri,christianmemije/kolibri,christianmemije/kolibri,christianmemije/kolibri,indirectlylit/kolibri,DXCanas/kolibri,jonboiser/kolibri,learningequality/kolibri,benjaoming/kolibri,DXCanas/kolibri,benjaoming/kolibri,lyw07/kolibri,lyw07/kolibri,mrpau/kolibri,lyw07/kolibri,indirectlylit/kolibri