[bug 1035319] Fix for the last time hopefully.