Followup to the comments in : !19029 (merged)
/CC @victorwu COuld you please check and merge? /cc @meks.