This is why I asked you in your refactor.  When we rebase we'll have to see if my util tests still pass.