This reverts commit 5417197d, reversing
changes made to 0630f64d.

Reverting to allow addressing review comments.

Link: https://lore.kernel.org/all/4c5dbea0-52a9-1c3d-7547-00ea54c90550@linux.intel.com/Signed-off-by: Jakub Kicinski <kuba@kernel.org>