Check in incomplete gen3 backport from long ago.