Revert rev 38340 (which was itself a reversion of 34807): if we can't find the