Comment 2 for bug 1869655

Not committing to do this before focal GA