Replace update from -r271410 accidentally lost in -r273575.