Fix to use builtin history.