Revert r262648 to stop severe tinderbox spamming on stable@.