Revert back to rework-walk.