Restored changes accidentally backed out by Dave Dykstra in previous revision.