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

This reverts commit e2dcec586eb14ab605d0442ae2cffccf5ca10294.