Made it back to the original code, now that we have branched pickles.