Revert change to remove Guava's Supplier from public API's