I'll just kill that code - it should be an external patch rather than resident in the source proper.