There are probably some @dataarchitectures here that we don't want to completely lose access to.