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

This reverts commit d16c951792cefdf43feda6d750aa0c0d9227b591.