At this point, probably not, this was moved in in another PR.
Let's talk and see what we can do.