I like this a lot, but the big question is how we get this in as we have a 4.14 change in this area. Either we'll have a self-conflict for 4.15, or we jus tdelay this to be pulled into 4.15 just after -rc1?