Why isn't this handler getting the modulestore by passing in the location in case it needs the draft version of the modulestore? Aren't these things that could potentially be in draft mode?

(And yes, I know this method was added by @cpennington and not you.)