Revert "Issue #2759243 by rajeshwari10: Replace the entity manager with the entity type manager in the code base" This reverts commit b26d7488.