Reverted FindEntityByClassname2 in UIM to previous version