This reverts commit 0dc1bfb7.
The succeeding patch series will supersede it.
Signed-off-by: NAKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: NAlexander Graf <agraf@suse.de>