Apply fix for MONDRIAN-1837.