Actually make this work right again.