Fix ICE regression caused by issue 7444 change.