yes i agree, not sure why we merged it like that, but yes, if you can do that on a PR that will get merged immediately