Agreed, it seems wrong.  Forgot to put a `TODO` marker in about that one, but you managed to catch it anyhow.    Thanks.  

I can comment out the test line and try to figure out all the affected call sites.  I worried about missing a spot in the real code if our test coverage isn't thorough though.

Thoughts?