Revert "Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle"