Revert stapler changes for guava 18.0
8 files changed