To be honest, I haven't checked how much of a can of worms this is... Will check it, see how crazy it is to backport it.