(Finally) conform to the 1.5 API that discarded stuff that's been deprecated for ages.