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

This reverts commit fce7c6223d82c4f615c139a7f057fd9fc15c3f3b.