Revert to CB guava