R1:a2367ddf7593

Minor, fix a bad merge on my part.

Auditors: btrahan