Still broken:(
Some quick hacks got it working