Added comments reminding us to improve this code when we go 1.1.1+ only (#4605)

1 file changed