Revert "cfs: tweaks for responsiveness"

This reverts commit 742f05f7f5237767e4043575d34245d13758e70a.