fixup! Move code that uses the modulestore to an XBlock service