Merge "Clean up image writer patching."