Revert some of the changes from upstream, look to be an incomplete implementation of uploading local MPD