Remove the old hack (don't quite remember why it was there)