Revert "[Core] Fixed up file after bad merge"

This reverts commit 6f90ba2a1f6c2c0b1265c131eb02230cf7f516ed.
Revert "Revert "[Core] Fixed up file after bad merge""

This reverts commit d846d817e3efcb612ee95f0842c2bc213bde16f2.