Revert "Issue #2267551 by catch | tim.plunkett: PHP 5.4.5 needed to avoid zend failure when using autoloaded traits." This reverts commit 8d97ffff.