Back out unrelated changes.