Re: BZ 791195 - Clean up destroy_on_provider code