Updated with a hack that actually works.