Fix regression causing too much collapsing of infill regions