Honestly, I do think we should move in that general direction, but since the dependency already exists, I'm ok with this PR either way.