> To that end, I think this is implemented correctly. If you would like, I can file another bug and ask Ian for guidance on this.

Sounds good to me. If this really is legacy code, this is a great time to remove it.