We'll need to keep some imports protected for now, but perhaps we can deprecate these and eventually remove? There are a couple validation functions in there that we need to be careful with related to backwards compat... likely not a big deal though.