I agree, created a separate issue for it here: #4616