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

This reverts commit 503804ad3140b868bf407570bd857beabf6faf86.