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

This reverts commit 4dc5c3e077e1c6172b678a4289f596ce66df1b9d.