Revert "cfs: tweaks for responsiveness"

This reverts commit 3d87130914ead01242a14d055798af2093529e0e.