Same comment here as for line 552, why keep this around?