Can we have a review for https://github.com/solidusio/solidus/pull/6121/files ? This is currently breaking a lot of extensions when they try to build with Solidus'

main

branch.