we now have two non-5.20 core dependency, one of which is going to be in 5.22 core anyway, the other which would require an extremely small bit of XS to replace