recommit simplification (r109502, backed out r109509); seems to innocent