Revert "ondemand: backport from CAF 3.4 kernel"

This reverts commit 2287f207f52b02d4522b61aeb872711f1d0e023e.