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

This reverts commit 8000fd8ad42c93df784d5dea9178f7c260e0a807.