Revert DiffChange: conflicts with Search