Remove PHP 5.4 specific code, sorry....