Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "close leaking BufferedReader""""""""""""

This reverts commit 7dc995328e6f1636fb3d8e94a255cb3f071fd157.