Revert "Merge pull request #294 from richardrodgers/DS-1647-MDWebService"

This reverts commit d9590e3d6555412e363071fe34f878bcb0e0a972, reversing
changes made to b98637afc7c476e75fcf061a326152b690c696b9.