Revert guava 18

Missed these earlier