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

This reverts commit 8e1c4ff82dfc2fb6fa932d2ef3c5e169909e9764.