we can get rid of this when we upgrade devices from kernel 5.x to 6.x (which clearly we also need to do)