Better fix for kdl pkg-config patch change so that the original pkg-config path gets restored after kdl is found