(For anyone reviewing, this was addressed by b45411018210cad4d630aa274bba3d2a1532086c