Core: Revert CM's shit