tentative workaround for FL-2888 until upstreeam doesn't sort it out.
revert latest as it dos not seems effective at fixing FL-2888.
new attempt at closing FL-2888.