I am having the issue that this solves- https://github.com/magento/magento2/commit/f7449dfcec46acd9843f50152d2710b29101cc08?diff=split
I was going to go ahead and make those changes then I came across this- https://github.com/magento/magento2/commit/4531b0967cfb6747cd74f5464cdebedc046ff212
Those are both under Magetwo-66840 but the second one is refactoring. Which one should I use? Or is there a different one I am unaware of? Or do I need to do both?