revert r80819 for now so we can use phpunit