Oh I didnt understood that backward compatability reference. I am removing this in a separate commit then.