This reverts commit a14a12ca.

The CTU size is always 32x32; the surface size is what actually sets
the desired property, and it is already correct.