Fix a gaping bug in upstream's upstream and properly burst founder, among other things