Reverting to simple sourcing - search path order issues