I'll revert that on the 4.9-next-wip branch and see if it makes a difference

I'm bisecting on linus's tree at the moment to see where the regression crept
in

I've also been runnig with these local patches to use Dave's D3cold work (I
reverted those before reporting) I'll attach them to the bug though