Upstream Changes

After talking to the maintainer, he made a commit and we decided my change wasn't the right fix. This should make it work again + a commit I made to the DS client code.