Revert "Merge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle into master-proposed"

This reverts commit dd3df705908da9ccf8d02900196ccddc28960f21, reversing
changes made to ccfcbc4df5936d3bf353c72af24cb43cbe2e6adf.