Restart from scratch again

And depend on Guava 14.0