Recommit r80858 again (which has been backed out in r80871).