See my addition above - this still seems to be broken.