forward port patch, code specifying plugins dir has moved files