Merge "Revert "Fix StrictMode I/O violations""