Is this actually unnecessary now?