Fix find_or_create_by with custom persistence.

[ fix #3243 ]
Revert "Fix find_or_create_by with custom persistence."

This reverts commit d706cbe5390d1c0b533730af62d91a487826da1f.