This reverts commit acf90b6c299afe9e9c8fa33c3c6992bfcf40fbbf. (Reverted to apply the better v2 of the patch) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>