This reverts commit 861f2a741f. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
861f2a741f