Nice catch, I will submit this CL to unblock Adrienne, and think on how to fix this issue.