We want the right path in instdir already. Setting it during
installation is too late.

Change-Id: I3f7045ce4b4d3cb1f0dfac1c4fcd036db847621d