Add workaround for ISPN-4837 regression.