qdsp5v2: partial revert of dd7be4dbd1268ede6994b7b9fd1c117965a90da1

Change-Id: Ie9ee37ad8b8b50f9471db91fff99cc5d67009880