Fix depending on guava 17