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

This reverts commit 24b4120a4e16b0504fdfd6501746aa6bd531a3e2.