bollocks, there's a lot of hacking around we do for different environments that would have been nice to remove. This needs modifying anyway for 3, since it's now a font.