ISAICP-7087: Apply upstream fix.

2 jobs for ISAICP-7087 in 13 seconds (queued for 3 seconds)