Considering the time wasted on breaking & fixing we just froze legacy kernel (fork it when MS allows us  as is and forget about. There are a lot of 3399 related patches getting in and that's is anyway irrelevant here.