Recommit r274750.