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

This reverts commit 22c28a07c437c1bed4fb2802ae482574bb689fde.