This reverts commit 7893e74311e53882d8f93ecb95a6bd9f5b14651e since it breaks the builds. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>