Fix invalid merge from master.