If this change isn't needed before `next-gen-modulestore`, let's just move it there, rather having unused broken code in this PR