[bug 1035319] Change way we handle paths in deploy.