fuji/scorpion: bring back CPU optimizations