would it be useful to add a comment that this if is only there for old infrastructure?