am 31273d0c: Merge "Revert "Clean up image writer patching.""
am 31273d0c: Merge "Revert "Clean up image writer patching.""

* commit '31273d0c1e3c29498cc2360584b8935bf35f4376':
  Revert "Clean up image writer patching."

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst