Fix the regression caused by r196378