Revert "Performance tweaks."

This reverts commit e4310f03115501bc42d2040e1b48ba48976a571e.
Merge pull request #688 from doctrine/revert-performance-tweaks

Revert "Performance tweaks."