[Core] Fix up broken backport