Reapply r54147 with a constraint to only use the 8-bit