Another build fix (after r146693) for r146682.