revert restructure pending figuring out what broke