Revert "Fixup for qdspv2_1x"

This reverts commit 65d168c57d34b146379ed6a8cf93254c9f0a62db.