Temporary revert r255541 since there is no CPU_FFS in stable/9 yet.  Sorry.