Add find_and_modify again

It was removed by an unexpected rollback