Fix up botched merge in 005f993.