D32 >>> D16 for tuna, and for the shorties

Revert "D16 > D32 for tuna"

This reverts commit 72262f32f5244247e4e6d17cdaed8a59d2523fff.

Change-Id: Ifa0a7ac53cb411cf839badc177113b27f20cae5d