on second thoughts, revert the ppc/darwin part of the previous patch