[bug 1035319] Another maybe fix.