seems to me like it’d be better to head down the tack of #4740 for this