CRM-14025 committing PR-2247 to 4.4 branch as intended.