See check-in [9c5dda4992].