revert last commit (should land in branch zworkb_memoize)