Revert "Backport CPU missing functions from 3.4 to 3.0.101"

This reverts commit e254a2501a68f5a9ab47742a50a57bdc736d927e.