Restore commit 89c3660

Restore commit
https://github.com/AmbiBox/AmbiBox-XBMC/commit/89c3660b03f27a64c5c7a043b9a8f427f10c2347