Revert "Merge branch 'wip-MDL-46547-master' of git://github.com/abgreeve/moodle into master-proposed"

This reverts commit ae2f8dafcaf586f3330abd1edcf094bdb2f98863, reversing
changes made to c225ce04d5c00112c617f872d07af661ddd5d9fe.