Revert "Mavenisation"