Re-fix the issue Bill fixed in r147899 in a slightly different way, which doesn't...