Make compatible with PHP 5.3, again ...