I didn't change these two lines. Thus, they are working for at least one year (?). 
Can we leave these lines for now? I will add a comment, that one should be careful...