This reverts commit 8c550e94.

This was prematurely applied and we need to back it out to merge
a better version of the development track for this feature.
Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>