Revert "Migrate maven to freestyle for merge"