This looks like a duplicate of the warning display you added in #4745 - is it now unnecessary?