I didn't notice that I already had applied this patch and while this
builds fine one copy is enough.

This reverts commit 22efef1c.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>