Yep thinking it might make sense to put this behind a flag.