Created by: mattaw
Sorry about the merge - should have rebased but too late.
Anyway the fix you want is f580efcf as I forgot bare metal start. The other one e59bca77 is just a cleanup, but probably helpful.
I can re-sync to your branch if you don't want the merge.