revert r158660, since Chris has some issues with this patch (namely using code to...