I did a horrible thing to get this working.  We should fix it as soon as possible