We were already doing this for non-intensity formats, but it seems like the same applies to intensity formats.