updated for Guava 18.0 deprecations