Revert 700a232..0084379

This rolls back to commit 700a232431b4db597b061d237b8c2e0992b7afcc.
background & continue-read fix