Fix a side effect of the merge of 519b40c9610f6fb86aa9fbb2f62cfd87881cab61.