Is this still necessary with the new warning?