Merge "Revert "Close print writers"" into pi-dev