Revert "Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle"