Comment 2 for bug 2023785

The agreement with product management here is that we can do it, but we need to make it be an explicit opt-in. We don't currently have a way to have this be opt-in, so we're going to need to build that first.