Revert "Merge branch 'MDL-38521-master' of git://github.com/andrewnicols/moodle into pre-integration"

This reverts commit 88fd76e1e1c98b107acff662c90f5372b564b9b0, reversing
changes made to d61c97e89c6b56e47efa46d218477ccafe830b21.