Merge pull request #7775 from routinet/CRM17995
authorTim Otten <totten@civicrm.org>
Tue, 9 Feb 2016 20:22:22 +0000 (12:22 -0800)
committerTim Otten <totten@civicrm.org>
Tue, 9 Feb 2016 20:22:22 +0000 (12:22 -0800)
Revert portion of CRM17748


Trivial merge