From: Tim Otten <totten@civicrm.org>
Date: Tue, 9 Feb 2016 20:22:22 +0000 (-0800)
Subject: Merge pull request #7775 from routinet/CRM17995
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fc96a57294641c1650e7e306482032a710c68c96;p=civicrm-core.git

Merge pull request #7775 from routinet/CRM17995

Revert portion of CRM17748
---

fc96a57294641c1650e7e306482032a710c68c96