Revert CPU changes for now