Merge "Fix another mistyped location."