Fix per PR review, adding back in
f15e8eb68acb18c2ca586f77a13140c94877d61f