Both are Reviewed-by: Matt Turner <mattst88 at gmail.com> (Typo in the title of this patch) Should 2/2 go to stable? I'm not really sure how that code gets used.