Revert "Revert "cfs: tweaks for responsiveness""

This reverts commit b93c5a14a7d7b3d51553643768fa4999bddfbb28.