Revert "Merge branch 'Frodo' of https://github.com/xbmc/xbmc into Frodo"

This reverts commit ff6d6f3e240bb2cb8a94774716fa669ce2c8ba52, reversing
changes made to 4d557369b05119bb36614c23576216d31fff9bfd.