Actually call the new swatch code. [1765]

D’oh. :(