Revert "merge"

Reverts hongsly/edx-platform#3