Revert "Merge pull request #1 from Cabris/edx_manual_cabris"

This reverts commit 99fcb7790cb675dd47e13a710a14b0dbc3916dd9, reversing
changes made to 208f0a22221c0d17a6f80a97949df04069ac5933.