This reverts commit c553b3934f45db8a6e77cfc7673787db3cc64f85.
This change clearly breaks builds since subsequent patches
depend on changes this patch removes. Not sure what's going
on here but this change isn't correct.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>