This needs to go through a deprecation cycle before it can be removed.