Remove diff--using the simpler approach.