Can you try Garrett's patch on 4.8? If it doesn't work, either try to fix it or send me the errors and I'll see if I can fix it. I'd like to start commiting Garrett's stuff but don't want to break 4.x. Is anyone else willing to test on 4.x?