Revert Stream api as it is not available in the mvn build