Revert "Merge branch 'MDL-34818_M24' of git://github.com/lazydaisy/moodle into MOODLE...