Revert "Merge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle"