France: Controversial plank dropped from security bill