They now use the currently working syntax.
Now that feature flags are only on nightly, it's good to split this stuff out.