This reverts commit 5c90b561930aac1783485d91579d313932273e92. The original change was intentional so back out 'fixes'. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>