Revert TRUNK-2663 Include guava library in core