revert r99862 which is causing FNT failures.