IMO it makes sense to remove the conditions, because we want this behavior in all pvr windows too.