Merge pull request #6407 from civicrm/revert-6236-CRM-16836