I don't believe this change is related - could we discuss this in a separate PR?