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

This reverts commit 7a23a82223fdeb4155f6c72abc3302d316a31ff3.