This reverts commit 99d94ef367. I accidentally applied this broken (failed to compile) patch due to a bug in my patchwork script. Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
99d94ef367