Revert "Merge branch 'MDL-49154' of git://github.com/timhunt/moodle"
Revert "Merge branch 'MDL-49154' of git://github.com/timhunt/moodle"

This reverts commit 7a5d394e3c3e0fab8200d0867f6974d9c583d6e4, reversing
changes made to 58d5cc53604aa4181adc1cddc39114f40673a2a3.

dilawar/moodle