Revert "Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle"
Revert "Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle"

This reverts commit 093a6fe77fc39b06c804fbe4bfcac9834a52c966, reversing
changes made to 88a4cb473439f5a2875260368b92fac1bb808c12.

dilawar/moodle