[bug 1035319] Temporary fix pending #1067586