[bug 1035319] Temp fix removed.