Fix broken nasty hack.