--CRM-10206, reverted back some changes that caused regression when creating multi...