Can't believe I'm actually doing this, but... one of the terrible hacks
is deprecated now?