Revert changes preventing running on Guava 17