Merge pull request #11634 from agh1/CRM-21735
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 6 Feb 2018 04:11:26 +0000 (17:11 +1300)
committerGitHub <noreply@github.com>
Tue, 6 Feb 2018 04:11:26 +0000 (17:11 +1300)
CRM-21735: Revert CRM-21575 changes pending fix


Trivial merge