MID-2063 temporary fix.