Removed workaround for PHP 5.2