This is probably redundant in light of line 799/