only one remaining patch to upstream source for now