revert r117858 while I check out a failure I missed.