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

This reverts commit 7f5049d81b44b6289cfebd2fcef782cb1bd82781.