Actually fixed the palette bug that I tried to work around in r2917.
Authored by: plombo 2010-12-05
Parent: [r2950]
Child: [r2952]
