revert logic (sometimes still fails)