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

This reverts commit 158c6a4120af86be9d7d7d0922910c782ba84d4e, reversing
changes made to 25519883a02ed291c4fd30781b89bbac4202d7c2.