This change hopefully forces this to work everywhere.