Hotfix/revert yadis fix

This is running in infrastructure production.  We found an issue with the yadis code so this reverts the "fixes" that we'd applied to the last release to make it work.