Extracting accidental master merge.