It's not a blocker for this PR, you are right. I didn't realize it was so tightly connected.