Fix faulty merge of master.