Comment 28 for bug 1781015

After getting my hands on some real hardware, I was able to properly reproduce this, hunt down the problem, and get a fix.

Uploading nowish, and the fix should be included in 20180719. Later today I'll play with getting Secure Boot working.

Thanks for all your help Nio, it's very much appreciated. :)