diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/domain/Firewall.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/domain/Firewall.java
index 626a4b11e8..6a3d5fa438 100644
--- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/domain/Firewall.java
+++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/domain/Firewall.java
@@ -27,8 +27,8 @@ import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.profitbricks.domain.internal.FirewallRuleCommonProperties;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 
-import autovalue.shaded.com.google.common.common.collect.Lists;
 import static com.google.common.net.InetAddresses.isInetAddress;
 
 @AutoValue
diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/domain/Nic.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/domain/Nic.java
index fc0de67fe9..f538d9b148 100644
--- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/domain/Nic.java
+++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/domain/Nic.java
@@ -18,8 +18,6 @@ package org.jclouds.profitbricks.domain;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import autovalue.shaded.com.google.common.common.collect.Lists;
-
 import com.google.auto.value.AutoValue;
 
 import java.util.List;
@@ -27,6 +25,8 @@ import java.util.List;
 import org.jclouds.javax.annotation.Nullable;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
 import static com.google.common.net.InetAddresses.isInetAddress;
 
 @AutoValue
diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/firewall/FirewallListResponseHandler.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/firewall/FirewallListResponseHandler.java
index e096148a19..b654801343 100644
--- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/firewall/FirewallListResponseHandler.java
+++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/firewall/FirewallListResponseHandler.java
@@ -16,8 +16,7 @@
  */
 package org.jclouds.profitbricks.http.parser.firewall;
 
-import autovalue.shaded.com.google.common.common.collect.Lists;
-
+import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 
 import java.util.List;
diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockListResponseHandler.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockListResponseHandler.java
index c56f0eafd6..6a0b419e48 100644
--- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockListResponseHandler.java
+++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/ipblock/IpBlockListResponseHandler.java
@@ -16,9 +16,11 @@
  */
 package org.jclouds.profitbricks.http.parser.ipblock;
 
-import autovalue.shaded.com.google.common.common.collect.Lists;
+import com.google.common.collect.Lists;
 import com.google.inject.Inject;
+
 import java.util.List;
+
 import org.jclouds.profitbricks.domain.IpBlock;
 import org.jclouds.profitbricks.http.parser.publicip.PublicIpListResponseHandler;
 import org.xml.sax.SAXException;
diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerListResponseHandler.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerListResponseHandler.java
index 4b31e8a8b6..50c1bea5a0 100644
--- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerListResponseHandler.java
+++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/loadbalancer/LoadBalancerListResponseHandler.java
@@ -16,9 +16,11 @@
  */
 package org.jclouds.profitbricks.http.parser.loadbalancer;
 
-import autovalue.shaded.com.google.common.common.collect.Lists;
+import com.google.common.collect.Lists;
 import com.google.inject.Inject;
+
 import java.util.List;
+
 import org.jclouds.date.DateCodecFactory;
 import org.jclouds.profitbricks.domain.LoadBalancer;
 import org.jclouds.profitbricks.http.parser.firewall.FirewallListResponseHandler;
diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/nic/NicListResponseHandler.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/nic/NicListResponseHandler.java
index 3d17c975d2..4a3ab665b8 100644
--- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/nic/NicListResponseHandler.java
+++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/nic/NicListResponseHandler.java
@@ -16,12 +16,14 @@
  */
 package org.jclouds.profitbricks.http.parser.nic;
 
-import autovalue.shaded.com.google.common.common.collect.Lists;
+import com.google.common.collect.Lists;
 import com.google.inject.Inject;
+
 import org.jclouds.profitbricks.domain.Nic;
 import org.xml.sax.SAXException;
 
 import java.util.List;
+
 import org.jclouds.profitbricks.http.parser.firewall.FirewallResponseHandler;
 
 public class NicListResponseHandler extends BaseNicResponseHandler<List<Nic>> {
diff --git a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/storage/StorageListResponseHandler.java b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/storage/StorageListResponseHandler.java
index d590c80443..572f761b6b 100644
--- a/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/storage/StorageListResponseHandler.java
+++ b/providers/profitbricks/src/main/java/org/jclouds/profitbricks/http/parser/storage/StorageListResponseHandler.java
@@ -16,9 +16,11 @@
  */
 package org.jclouds.profitbricks.http.parser.storage;
 
-import autovalue.shaded.com.google.common.common.collect.Lists;
+import com.google.common.collect.Lists;
 import com.google.inject.Inject;
+
 import java.util.List;
+
 import org.jclouds.date.DateCodecFactory;
 import org.jclouds.profitbricks.domain.Storage;
 import org.xml.sax.SAXException;
diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiLiveTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiLiveTest.java
index aacc314c05..20cf5f801d 100644
--- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiLiveTest.java
+++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/DrivesApiLiveTest.java
@@ -16,16 +16,20 @@
  */
 package org.jclouds.profitbricks.features;
 
-import autovalue.shaded.com.google.common.common.collect.Iterables;
 import java.util.List;
+
 import org.jclouds.profitbricks.BaseProfitBricksLiveTest;
 import org.jclouds.profitbricks.domain.Drive;
 import org.jclouds.profitbricks.domain.Image;
 import org.jclouds.profitbricks.domain.Server;
+
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
+
 import org.testng.annotations.Test;
 
+import com.google.common.collect.Iterables;
+
 @Test(groups = "live", testName = "DrivesApiLiveTest", singleThreaded = true)
 public class DrivesApiLiveTest extends BaseProfitBricksLiveTest {
 
diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiLiveTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiLiveTest.java
index 78e7dbd8b8..cd38494b8b 100644
--- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiLiveTest.java
+++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/features/FirewallApiLiveTest.java
@@ -16,6 +16,7 @@
  */
 package org.jclouds.profitbricks.features;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 
 import java.util.List;
@@ -41,8 +42,6 @@ import org.testng.annotations.Test;
 
 import com.google.common.base.Predicate;
 
-import autovalue.shaded.com.google.common.common.collect.ImmutableList;
-
 @Test(groups = "live", testName = "FirewallApiLiveTest", singleThreaded = true)
 public class FirewallApiLiveTest extends BaseProfitBricksLiveTest {