fix the previous fix of my broken rebase
fix the previous fix of my broken rebase

I should have checked the result of the rebase more carefully, but I
guess git rebase made me lazy.

ldm5180/hammerhead,ldm5180/hammerhead,ldm5180/hammerhead,ldm5180/hammerhead,ldm5180/hammerhead,ldm5180/hammerhead,ldm5180/hammerhead