make it clear the new behavior is only for v4

Change-Id: Ia040c367121751ad5f50d76fedb77e30d9c0a238