Due to where this is used, it would require a number of refactors. Would be a little awkward to refactor the methods this is used in too, because of some other stuff we do. So, I'm just going to leave this since we're ditching KIF.