::Revert "Merge branch 'master' of github.com:xbmc/xbmc"

This reverts commit 6095130a0a441fdf61fa9ba1d1432ece3f5bc6a4, reversing
changes made to 7e6433169c93abd22e28a828fa024cf744fe5e86.