self revert r43332 due to a PHP Strict Standards error