Avoiding broken parts of Guava

See https://code.google.com/p/guava-libraries/issues/detail?id=1635

Hopefully good to go now.