This reverts commit 9514ff19.
Signed-off-by: NJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>