Give up on solving race, revert redo use