There was a conflict here, when I was doing cherry-picking. What should the bypass value be?