XBMC bug is fixed so we no longer need this workaround.