Merge "Revert "Clean up image writer patching.""