Upgraded to Guava 17