We should only do this *after* the 2.1.9 rollout. If we do for 2.1.9 and there are problems in the release, we won't be able to roll back so easily.
We should only do this *after* the 2.1.9 rollout. If we do for 2.1.9 and there are problems in the release, we won't be able to roll back so easily.