Comment 6 for bug 784575

Right, Jono, the order will be (1) give pertinent feature flags to everyone, (2) make sure nothing falls over, (3) land the branch we have that removes the feature flags and makes this change.