[Core] Revert part of last commit