Removed hack for running on PHP 5.3