[Core] Fixed up file after bad merge