Revert "Core"

This reverts commit fc134989d30fbdcb3952754ff9d7967beff8b653.