change to nearest-neighbor was too aggressive; partly reverting