I think we can just remove this code, honestly.  I don't see how it'll break anything.