Guava dependency removed - coming from GCommons.