[fix] finalize the revert of the branch' better_cpu'

4 jobs for stable/ws2p-v1.1-trymerge in 7 minutes and 51 seconds (queued for 9 seconds)