Removed painful version hack. Hope I do not need to put it back.