I had just started reading your PR when I made that comment and you're right its out of scope. Let's just skip this change for now.