These two probably shouldn't actually be deprecated