Bug 921003 - Make directory skipping opt-in, as initially intended. r=me