Removed reliance on PHP 5.4 features