@mateiz 
I am not sure whether this is still necessary or not. I doubt it. I can remove this if you think the same.