Should this still be required with this change?