Okay, we'll leave that in then, but I'll open an issue saying we should use them starting from XBMC13 then.