Remove horrible hack.