a6328a1481
This reverts commit e5e2c6041d.
Reason for revert: Requires priv_cp_queues=1
Change-Id: Ia6c78ac25b88d7ef4703654075d54e672a6e320c