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