Chain Fix Revert

See the commit description. Basically when I've fixed it, it became too much to maintain and I had no idea what the code did 😿 . I'll save it for when we have the new zone API an use portions of it, but until then, no need to keep this buggy code in the master.