Drop this, and cherry-pick https://github.com/t-nelson/xbmc/commit/63acfdad203fab45422abd13470b3f679f18361a