core: fix bad merge of c843a45