This reverts commit e7044726.

Already picked up via Eduardo's thermal tree
Signed-off-by: Andy Gross <andy.gross@linaro.org>