Revert "Revert "nohz: Fix another inconsistency between CONFIG_NO_HZ=n and nohz=off""

This reverts commit 235ed47b501a617bf744e5c41c246dd4b6ade309.