Reverting to old directory handling