Upgraded to latest trunk which actually works.