Removing code that is not only not required, but actually breaks test cases.  Can solve a different way.