Comment 11 for bug 1790169

Since this bug is committed and partially released, I have opened #1844532 as a follow-up to address the eg2 problems Remington identified in comment #8.