Yes we need it, but it's a pain to write a unit test for. Good catch.