Remove this code, will try to find a real solution
Merge branch 'master' into playlist