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

This reverts commit 7b7393451081383db5771386e5e3a54ad6ba4a30.