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