Any risk to removing this here? /cc @denixport
Otherwise, the PR looks good to me. Thanks, Andreas.