Oops! Didn't realize that the stripLen option can be passed to fetchpatch. Seems a cleaner than my method This reverts commit eb7362a3.