* fixes #22686 * would be better served in the future by using subspec, but it's in too much flux right now