@lukemelia i ended up adding some of this stuff back in since we're supposed to do our best to use feature flags