Partially revert 5dac229eb87
Merge pull request #4005 from civicrm/4.5

Partially revert 5dac229eb87