Already in 1.7 branch, removed folders