i also added back a module that we made dead code for some reason in https://phab.comm.dev/D8820 ... we definitely need this function so i think it was a mistake. i should've reviewed this more carefully before commandeering the diff.
Depends on D9472