You cant predict how it should work for a future solution, which we IMHO never will see. No one will curse us for this because we are not talking about a external library solution with a fixed API. I don't want to start a commit war in master but please consider to leave like it is until it is required.