This reverts commit 14840b9a.

The commit breaks audio, and a new version will be applied later.
Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>